From bee39f611187ee03dcd230ea071749031bea2be0 Mon Sep 17 00:00:00 2001 From: divverent Date: Tue, 6 Jan 2015 15:20:35 +0000 Subject: [PATCH] Add missing CFLAGS for ODE. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12118 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=9120bf3dc128de323bfc5a82553fcc310dad7a33 --- .travis-script-xonotic.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index ff9bef85..3da7dde2 100755 --- a/.travis-script-xonotic.sh +++ b/.travis-script-xonotic.sh @@ -21,13 +21,13 @@ for os in "$@"; do case "${os}" in linux32) chroot="sudo chroot ${PWD}/buildroot.i386" - makeflags='STRIP=: CC="${CC} -m32 -march=i686 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" SDL_CONFIG=sdl2-config LIB_JPEG=../../../${deps}/lib/libjpeg.a LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" LIB_ODE="../../../${deps}/lib/libode.a" DP_LINK_ZLIB=shared DP_LINK_JPEG=shared DP_LINK_ODE=shared DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen' + makeflags='STRIP=: CC="${CC} -m32 -march=i686 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" SDL_CONFIG=sdl2-config LIB_JPEG=../../../${deps}/lib/libjpeg.a LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" LIB_ODE="../../../${deps}/lib/libode.a" DP_LINK_ZLIB=shared DP_LINK_JPEG=shared DP_LINK_ODE=shared DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen' maketargets='release' outputs='darkplaces-glx:darkplaces-linux32-glx darkplaces-sdl:darkplaces-linux32-sdl darkplaces-dedicated:darkplaces-linux32-dedicated' ;; linux64) chroot= - makeflags='STRIP=: CC="${CC} -m64 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" SDL_CONFIG=sdl2-config LIB_JPEG=../../../${deps}/lib/libjpeg.a LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" LIB_ODE="../../../${deps}/lib/libode.a" DP_LINK_ZLIB=shared DP_LINK_JPEG=shared DP_LINK_ODE=shared DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen' + makeflags='STRIP=: CC="${CC} -m64 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" SDL_CONFIG=sdl2-config LIB_JPEG=../../../${deps}/lib/libjpeg.a LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" LIB_ODE="../../../${deps}/lib/libode.a" CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" DP_LINK_ZLIB=shared DP_LINK_JPEG=shared DP_LINK_ODE=shared DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen' maketargets='release' outputs='darkplaces-glx:darkplaces-linux64-glx darkplaces-sdl:darkplaces-linux64-sdl darkplaces-dedicated:darkplaces-linux64-dedicated' ;; -- 2.39.2