Page MenuHomePhabricator (Chris)
Files F134960

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.travis.yml b/.travis.yml
index 4482b4a..f3a7247 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,30 @@
language: cpp
git:
depth: 10
matrix:
include:
- os: linux
compiler: gcc
addons:
apt:
packages:
- libsdl1.2-dev
- libsdl-image1.2-dev
- libsdl-ttf2.0-dev
- libsdl-mixer1.2-dev
- libsdl-gfx1.2-dev
- libcurl4-openssl-dev
- libarchive-dev
- liblua5.2-dev
- os: osx
compiler: clang
before_install:
- - brew install sdl sdl_image sdl_ttf sdl_mixer sdl_gfx
+ - brew install sdl sdl_image sdl_ttf sdl_mixer sdl_gfx libarchive
# libcurl (xcode builtin)
- # libarchive (xcode builtin)
# brew only has lua 5.1 and 5.3, so we need to compile it from source
- export LUA52_VERSION=5.2.4
- wget http://www.lua.org/ftp/lua-$LUA52_VERSION.tar.gz
- tar zxf lua-$LUA52_VERSION.tar.gz
- cd lua-$LUA52_VERSION && make macosx && sudo make install && cd ..
script:
- mkdir build && cd build && cmake .. && make
diff --git a/appveyor.yml b/appveyor.yml
index 6c08ddc..780570d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,17 +1,19 @@
version: 1.0.{build}
clone_depth: 10
shallow_clone: true
platform: x86
configuration: Debug
install:
- ps: Start-FileDownload 'https://www.libsdl.org/release/SDL-devel-1.2.15-VC.zip'
- 7z x SDL-devel-1.2.15-VC.zip
- ps: Start-FileDownload 'https://www.libsdl.org/projects/SDL_image/release/SDL_image-devel-1.2.12-VC.zip'
- 7z x SDL_image-devel-1.2.12-VC.zip
before_build:
- - set PATH=.\SDL-1.2.15\include\;.\SDL-1.2.15\lib\x86\;.\SDL_image-1.2.12\include\;.\SDL_image-1.2.12\lib\x86\;%PATH%
+ # debug
+ - dir
- mkdir build && cd build
+ - set PATH=..\SDL-1.2.15\include\;..\SDL-1.2.15\lib\x86\;..\SDL_image-1.2.12\include\;..\SDL_image-1.2.12\lib\x86\;%PATH%
- cmake -G "Visual Studio 14 2015" ..
build:
project: build\meandmyshadow.sln
verbosity: normal

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jun 19, 8:27 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
71501
Default Alt Text
(2 KB)

Event Timeline