commit 393d4052

sago007 · 2016-01-16 14:27
393d40525fc652377409aa12896451c37cd4b920 patch · browse files
parent 9fe7a2e4eeb7dbd988c700f4bf29f584caf54329

Updated travis files

Changed files

M	.travis.yml before
M	travis_build.script before

diff --git a/.travis.yml b/.travis.yml index 4c18243..4ec0a80 100644 --- a/.travis.yml +++ b/.travis.yml

@@ -14,6 +14,7 @@ addons:

- libphysfs-dev

- libboost1.55-dev

- libjsoncpp-dev

+ - cmake

cache:

apt: true

diff --git a/travis_build.script b/travis_build.script index b58cefd..f082018 100755 --- a/travis_build.script +++ b/travis_build.script

@@ -3,7 +3,8 @@ set -e

# Travis runs Ubuntu 12.04 and misses libutfcpp-dev.

cp source/misc/travis_help/utf8_v2_3_4/source/utf8.h source/code/

cp -r source/misc/travis_help/utf8_v2_3_4/source/utf8 source/code/

-make -C source/code -f Makefile

+cmake .

+make

make clean

./packdata.sh

#i686-pc-mingw32-c++ -c -std=c++11 source/code/os.cpp -o windows_os_test.o