X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=63784c1cdf60d431603fa54807124020b75ea314;hp=4d834921f387b208ea28f9ba6aa3ef5e3e3e7362;hb=42e363f887af6c9e90393122500abdf1d68c4946;hpb=6c11bb65130b34e7c57fa8d4af3c42c966bb6afc

diff --git a/all b/all
index 4d834921..63784c1c 100755
--- a/all
+++ b/all
@@ -673,8 +673,8 @@ case "$cmd" in
 						realbase=$base
 						;;
 					*)
-						l0=`git rev-parse "$base".."$ref" | wc -l`
-						l1=`git rev-parse master.."$ref" | wc -l`
+						l0=`git rev-list "$base".."$ref" | wc -l`
+						l1=`git rev-list master.."$ref" | wc -l`
 						if [ $l0 -gt $l1 ]; then
 							realbase=master
 						else
@@ -710,7 +710,7 @@ case "$cmd" in
 							GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
 							reportdo4 cat "$t"
 							reportecho4 "--> merge failed"
-						elif ! "$SELF" compile 2>&1 | tee "$t"; then
+						elif ! "$SELF" compile -n 2>&1 | tee "$t"; then
 							git reset --hard "$org"
 							GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
 							reportdo4 cat "$t"
@@ -813,34 +813,43 @@ case "$cmd" in
 	release-engine-win32)
 		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
 		"$SELF" release-compile win32 \
-			'"DP_MAKE_TARGET=mingw CC="$HOME/mingw32/bin/i386-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="$HOME/mingw32/bin/i386-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' \
+			'"DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/db.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
 			debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
 		;;
+	release-engine-win64)
+		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
+		"$SELF" release-compile win32 \
+			'"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/db.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config"' \
+			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
+			debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe'
+		;;
 	release-engine-osx)
 		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/
 		"$SELF" release-compile osx \
-			'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"' \
+			'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib"' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
 			sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin'
 		;;
 	release-engine-linux32)
 		"$SELF" release-compile linux32 \
-			'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/darkplaces-deps/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/darkplaces-deps/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/darkplaces-deps/include"' \
+			'CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib DP_LINK_TO_LIBJPEG=1' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
 			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux32-dedicated'
 		;;
 	release-engine-linux64)
 		"$SELF" release-compile linux64 \
-			'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/darkplaces-deps/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/darkplaces-deps/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/darkplaces-deps/include"' \
+			'CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib DP_LINK_TO_LIBJPEG=1' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
 			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux64-dedicated'
 		;;
 	release-engine)
-		"$SELF" release-engine-win32
-		"$SELF" release-engine-osx
-		"$SELF" release-engine-linux32
-		"$SELF" release-engine-linux64
+		"$SELF" release-engine-win32 &
+		"$SELF" release-engine-win64 &
+		"$SELF" release-engine-osx &
+		"$SELF" release-engine-linux32 &
+		"$SELF" release-engine-linux64 &
+		wait
 		;;
 	release-maps)
 		"$SELF" update-maps