From 27ee4337fe6918817f48a25cd3b1114d0ec03281 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 18 Nov 2018 18:52:57 +0300 Subject: [PATCH] travis: fix building sdl2, fix libpath in wscript --- engine/wscript | 5 ++++- scripts/build_linux_engine.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/wscript b/engine/wscript index 3a4dc9ab..12d8be1e 100644 --- a/engine/wscript +++ b/engine/wscript @@ -33,7 +33,10 @@ def configure(conf): conf.start_msg('Configuring SDL2 by provided path') conf.env.HAVE_SDL2 = 1 conf.env.INCLUDES_SDL2 = [os.path.abspath(os.path.join(conf.options.SDL2_PATH, 'include'))] - conf.env.LIBPATH_SDL2 = [os.path.abspath(os.path.join(conf.options.SDL2_PATH, 'lib/x86'))] + libpath = 'lib' + if(conf.env.COMPILER_CC == 'msvc'): + libpath = 'lib/x86' + conf.env.LIBPATH_SDL2 = [os.path.abspath(os.path.join(conf.options.SDL2_PATH, libpath))] conf.env.LIB_SDL2 = ['SDL2'] conf.end_msg('ok') else: diff --git a/scripts/build_linux_engine.sh b/scripts/build_linux_engine.sh index ee1094f2..43d75de4 100755 --- a/scripts/build_linux_engine.sh +++ b/scripts/build_linux_engine.sh @@ -2,7 +2,7 @@ # Build custom SDL2 -cd $TRAVIS_BUILD_DIR/SDL2-2.0.7 +cd $TRAVIS_BUILD_DIR/SDL2_src export CC="ccache gcc -msse2 -march=i686 -m32 -ggdb -O2" ./configure \ --disable-dependency-tracking \