diff --git a/.travis.yml b/.travis.yml index f5ead510..3adb59f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,9 +35,7 @@ compiler: - gcc before_install: - - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null ; fi' - - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl sdl_image sdl_ttf sdl2 sdl2_image sdl2_ttf lua ; fi' - - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then export OSX_STATIC=0 ; fi' + - 'which pkg-config' # to avoid errors with git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f.. install: @@ -49,7 +47,9 @@ script: - 'make -j3' - 'make ziprelease' - 'if [ "$WIN32CROSS" = "1" ] ; then make win32installer ; fi' + - 'if [ "$TRAVIS_OS_NAME" = "osx" ] ; then API=sdl2 make 3rdparty -j3 ; fi' - 'if [ "$WIN32CROSS" = "1" ] ; then API=win32 make -j3 ; else API=sdl2 make -j3 ; fi' + - 'if [ "$TRAVIS_OS_NAME" = "osx" ] ; then otool -L ${PWD}/3rdparty/usr/lib/libSDL_image-1.2.0.dylib ; echo "--" ; tools/osx_find_dependencies.sh ${PWD}/3rdparty/usr/lib/libSDL_image.dylib ; fi' - 'if [ "$WIN32CROSS" = "1" ] ; then API=win32 make ziprelease ; else API=sdl2 make ziprelease ; fi' - 'if [ "$WIN32CROSS" = "1" ] ; then API=win32 make win32installer ; fi' - 'if [ "$WIN32CROSS" = "" ] && [ "$TRAVIS_OS_NAME" = "linux" ] ; then API=x11 make -j3 ; API=x11 make ziprelease ; fi'