YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

travis: fix building sdl2, fix libpath in wscript

Browse Source
This commit is contained in:
Alibek Omarov 2018-11-18 18:52:57 +03:00
parent f0297fc448
commit 27ee4337fe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/wscript
View File

@ -33,7 +33,10 @@ def configure(conf):
conf.start_msg('Configuring SDL2 by provided path') conf.start_msg('Configuring SDL2 by provided path')
conf.env.HAVE_SDL2 = 1 conf.env.HAVE_SDL2 = 1
conf.env.INCLUDES_SDL2 = [os.path.abspath(os.path.join(conf.options.SDL2_PATH, 'include'))] 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.env.LIB_SDL2 = ['SDL2']
conf.end_msg('ok') conf.end_msg('ok')
else: else:

2
scripts/build_linux_engine.sh
View File

@ -2,7 +2,7 @@
# Build custom SDL2 # 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" export CC="ccache gcc -msse2 -march=i686 -m32 -ggdb -O2"
./configure \ ./configure \
--disable-dependency-tracking \ --disable-dependency-tracking \