commit dad64897
Changed travis a bit... need to fix scons at some point...
Changed files
| M | .travis.yml before |
| M | travis_build.script before |
diff --git a/.travis.yml b/.travis.yml
index a80311a..389cebd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,14 @@ addons:
packages:
- g++-4.9
- build-essential
- - libsdl1.2-dev
- - libsdl-image1.2-dev
- - libsdl-mixer1.2-dev
- - libsdl-ttf2.0-dev
+ - libsdl2-dev
+ - libsdl2-image-dev
+ - libsdl2-mixer-dev
+ - libsdl2-ttf-dev
- libenet-dev
- libphysfs-dev
- libboost1.55-dev
+ - libjsoncpp-dev
- scons
cache:
diff --git a/travis_build.script b/travis_build.script
index 1af8ae1..ef52b77 100755
--- a/travis_build.script
+++ b/travis_build.script
@@ -5,5 +5,5 @@ cp -r source/misc/travis_help/utf8_v2_3_4/source/utf8 source/code/
make -C source/code -f Makefile
make clean
./packdata.sh
-scons -Q prefix=$HOME -Q sharedir=$HOME/share/
+#scons -Q prefix=$HOME -Q sharedir=$HOME/share/