From: divverent Date: Tue, 6 Jan 2015 15:20:38 +0000 (+0000) Subject: Reformat the makeflags. X-Git-Tag: xonotic-v0.8.1~29^2~41 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3c69ebebce675210e2cc74c399cedecfac7bdcb0;p=xonotic%2Fdarkplaces.git Reformat the makeflags. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12119 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index 3da7dde2..8b8f5c90 100755 --- a/.travis-script-xonotic.sh +++ b/.travis-script-xonotic.sh @@ -21,13 +21,35 @@ 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" 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' + makeflags='STRIP=: + CC="${CC} -m32 -march=i686 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" + SDL_CONFIG=sdl2-config + DP_LINK_CRYPTO=shared + LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" + DP_LINK_CRYPTO_RIJNDAEL=dlopen + DP_LINK_JPEG=shared + LIB_JPEG=../../../${deps}/lib/libjpeg.a + DP_LINK_ODE=shared + CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" + LIB_ODE="../../../${deps}/lib/libode.a" + DP_LINK_ZLIB=shared' 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" 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' + makeflags='STRIP=: + CC="${CC} -m64 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" + SDL_CONFIG=sdl2-config + DP_LINK_CRYPTO=shared + LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" + DP_LINK_CRYPTO_RIJNDAEL=dlopen + DP_LINK_JPEG=shared + LIB_JPEG="../../../${deps}/lib/libjpeg.a" + DP_LINK_ODE=shared + CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" + LIB_ODE="../../../${deps}/lib/libode.a" + DP_LINK_ZLIB=shared' maketargets='release' outputs='darkplaces-glx:darkplaces-linux64-glx darkplaces-sdl:darkplaces-linux64-sdl darkplaces-dedicated:darkplaces-linux64-dedicated' ;; @@ -35,19 +57,52 @@ for os in "$@"; do chroot= # -mstackrealign works around SDL2-2.0.3 issue that stack is not 16 bytes aligned, breaking SSE. # Please kill once SDL comes to its senses. - makeflags='STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -mstackrealign -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../${deps}/bin/sdl2-config" DP_LINK_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN32RELEASE=1 D3D=1' + makeflags='STRIP=: + D3D=1 + DP_MAKE_TARGET=mingw + UNAME=MINGW32 + WIN32RELEASE=1 + CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -mstackrealign -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" + WINDRES="i686-w64-mingw32-windres" + SDL_CONFIG="../../../${deps}/bin/sdl2-config" + DP_LINK_CRYPTO=dlopen + DP_LINK_CRYPTO_RIJNDAEL=dlopen + DP_LINK_JPEG=dlopen + DP_LINK_ODE=dlopen + DP_LINK_ZLIB=dlopen' maketargets='release' outputs='darkplaces.exe:darkplaces-wgl.exe darkplaces-sdl.exe:darkplaces.exe darkplaces-dedicated.exe:darkplaces-dedicated.exe' ;; win64) chroot= - makeflags='STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="x86_64-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG="../../../${deps}/bin/sdl2-config" DP_LINK_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN64RELEASE=1 D3D=1' + makeflags='STRIP=: + D3D=1 + DP_MAKE_TARGET=mingw + UNAME=MINGW32 + WIN64RELEASE=1 + CC="x86_64-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" + WINDRES="x86_64-w64-mingw32-windres" + SDL_CONFIG="../../../${deps}/bin/sdl2-config" + DP_LINK_CRYPTO=dlopen + DP_LINK_CRYPTO_RIJNDAEL=dlopen + DP_LINK_JPEG=dlopen + DP_LINK_ODE=dlopen + DP_LINK_ZLIB=dlopen' maketargets='release' outputs='darkplaces.exe:darkplaces-x64-wgl.exe darkplaces-sdl.exe:darkplaces-x64.exe darkplaces-dedicated.exe:darkplaces-x64-dedicated.exe' ;; osx) chroot= - makeflags='STRIP=: CC="gcc -g1 -arch x86_64 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.5 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" SDLCONFIG_MACOSXCFLAGS="-I${PWD}/SDL2.framework/Headers" SDLCONFIG_MACOSXLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers" SDLCONFIG_MACOSXSTATICLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen' + makeflags='STRIP=: + CC="gcc -g1 -arch x86_64 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.5 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" + SDLCONFIG_MACOSXCFLAGS="-I${PWD}/SDL2.framework/Headers" + SDLCONFIG_MACOSXLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers" + SDLCONFIG_MACOSXSTATICLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers" + DP_LINK_CRYPTO=dlopen + DP_LINK_CRYPTO_RIJNDAEL=dlopen + DP_LINK_JPEG=dlopen + DP_LINK_ODE=dlopen + DP_LINK_ZLIB=shared' maketargets='sv-release sdl-release' outputs='darkplaces-sdl:darkplaces-osx-sdl-bin darkplaces-dedicated:darkplaces-osx-dedicated' ;;