mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-12-25 02:05:26 +01:00
travis: fix building sdl2, fix libpath in wscript
This commit is contained in:
parent
f0297fc448
commit
27ee4337fe
@ -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:
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user