From a7540811cc74769e971002a7a34cf387325c9446 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 24 Jul 2013 20:05:32 +0200 Subject: [PATCH] attempt to make xonotic work with new build system in darkplaces --- misc/tools/all/release.subr | 10 +++++----- misc/tools/all/xonotic.subr | 14 +++++++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index e312f087..8fdbd501 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -264,14 +264,14 @@ case "$cmd" in release-engine-win32) release_common verbose "$SELF" release-compile win32 \ - 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i586-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \ + 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i586-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= LIB_ODE= CFLAGS_ODE=-DUSEODE CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \ gmqcc.exe 'gmqcc.exe:Xonotic/gmqcc/gmqcc.exe' \ release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe' ;; release-engine-win64) release_common verbose "$SELF" release-compile win64 \ - 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="amd64-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \ + 'STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="amd64-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= LIB_ODE= CFLAGS_ODE=-DUSEODE WIN64RELEASE=1 D3D=1' \ gmqcc.exe 'gmqcc.exe:Xonotic/gmqcc/gmqcc-x64.exe' \ release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe' ;; @@ -279,21 +279,21 @@ case "$cmd" in release_common # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed verbose "$SELF" release-compile osx \ - 'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \ + 'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6" LIB_ODE= CFLAGS_ODE=-DUSEODE' \ gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.osx' \ 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-linux32) release_common verbose "$SELF" release-compile linux32 \ - 'STRIP=: CC="gcc -m32 -march=i686 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib DP_GMP_STATIC_LIBDIR=.deps/lib' \ + 'STRIP=: CC="gcc -m32 -march=i686 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" LIB_MODPLUG=.deps/lib/libmodplug.a LIB_JPEG=.deps/lib/libjpeg.a LIB_CRYPTO=".deps/lib/libd0_blind_id.a .deps/lib/libgmp.a" LIB_ODE= CFLAGS_ODE=-DUSEODE' \ gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.linux32' \ release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated' ;; release-engine-linux64) release_common verbose "$SELF" release-compile linux64 \ - 'STRIP=: CC="gcc -m64 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib DP_GMP_STATIC_LIBDIR=.deps/lib' \ + 'STRIP=: CC="gcc -m64 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" LIB_MODPLUG=.deps/lib/libmodplug.a LIB_JPEG=.deps/lib/libjpeg.a LIB_CRYPTO=".deps/lib/libd0_blind_id.a .deps/lib/libgmp.a" LIB_ODE= CFLAGS_ODE=-DUSEODE' \ gmqcc 'gmqcc:Xonotic/gmqcc/gmqcc.linux64' \ release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' ;; diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 59ef5eff..1fcce870 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -136,10 +136,18 @@ case "$cmd" in MAKEFLAGS=-j$ncpus fi if [ -n "$WE_HATE_OUR_USERS" ]; then - MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw LIB_JPEG= CFLAGS_LIBJPEG=" + MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw" fi fi + # win32: don't rely on jpeg includes + if [ -n "$WE_HATE_OUR_USERS" ]; then + MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG=" + fi + + # ODE is optional + MAKEFLAGS="$MAKEFLAGS LIB_ODE= CFLAGS_ODE=-DUSEODE" + # workaround ARM issue in DP's makefile.inc case `uname -m` in x86_64|*86) @@ -192,13 +200,13 @@ case "$cmd" in #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/ #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_rijndael".* .libs/ #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/ - MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/ DP_GMP_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/" + MAKEFLAGS="$MAKEFLAGS LIB_CRYPTO=../misc/builddeps/dp.linux64/lib/libd0_blind_id.a LIB_CRYPTO+=../misc/builddeps/dp.linux64/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../misc/builddeps/dp.linux64/lib/libd0_rijndael.a" ;; *86) #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/ #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_rijndael".* .libs/ #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/ - MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_GMP_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/" + MAKEFLAGS="$MAKEFLAGS LIB_CRYPTO=../misc/builddeps/dp.linux32/lib/libd0_blind_id.a LIB_CRYPTO+=../misc/builddeps/dp.linux32/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../misc/builddeps/dp.linux32/lib/libd0_rijndael.a" ;; *) compiled0=true -- 2.39.2