X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=f63bd9626661eb164cbbd9cdf62a7595b92bc265;hp=8a8f82f98b6fda29c0979f384236c583efdb6bc0;hb=02d4ca6d4b2c520bacb1e97cf7526be532f9b54b;hpb=96899d108f5ab0d3b5905136709f3f0f4ee6e2d5

diff --git a/all b/all
index 8a8f82f9..f63bd962 100755
--- a/all
+++ b/all
@@ -119,6 +119,7 @@ darkplaces                    |
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
 div0-gittools                 |                                                   | master      |
 netradiant                    |                                                   | master      |
+d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -496,18 +497,21 @@ case "$cmd" in
 		fi
 		case "$1" in
 			-c)
+				cleand0=true
 				cleandp=true
 				cleanqcc=true
 				cleanqc=true
 				shift
 				;;
 			-n)
+				cleand0=false
 				cleandp=false
 				cleanqcc=false
 				cleanqc=false
 				shift
 				;;
 			*)
+				cleand0=false
 				cleandp=false
 				cleanqcc=false
 				cleanqc=true # version info
@@ -562,6 +566,16 @@ case "$cmd" in
 			fi
 		fi
 
+		enter "$d0/d0_blind_id" verbose
+		if ! [ -f Makefile ]; then
+			verbose sh autogen.sh
+			verbose ./configure
+		fi
+		if $cleand0; then
+			verbose make $MAKEFLAGS clean
+		fi
+		verbose make $MAKEFLAGS
+
 		enter "$d0/fteqcc" verbose
 		if $cleanqcc; then
 			verbose make $MAKEFLAGS clean
@@ -593,12 +607,13 @@ case "$cmd" in
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
-			export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$PATH"
+			export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
 			client=-sdl
 		else
+			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
 			client=-sdl
 		fi
 		case "$1" in
@@ -895,7 +910,7 @@ case "$cmd" in
 		verbose rm -rf Xonotic Xonotic*.zip
 		verbose mkdir -p Xonotic
 		verbose date +%Y%m%d > Xonotic/stamp.txt
-		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
+		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
 			verbose cd Xonotic
 			verbose mkdir data fteqcc source source/darkplaces source/fteqcc
 			verbose tar xvf -
@@ -980,7 +995,7 @@ case "$cmd" in
 	release-engine-osx)
 		# gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
 		verbose "$SELF" release-compile osx \
-			'STRIP=: 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 -I$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks" -fno-reorder-blocks' \
+			'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
 			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin' 'darkplaces-dedicated:xonotic-osx-dedicated'
 		;;
@@ -999,7 +1014,7 @@ case "$cmd" in
 	release-engine)
 		verbose "$SELF" release-engine-osx
 		verbose "$SELF" release-engine-win32
-		verbose "$SELF" release-engine-win64
+		# verbose "$SELF" release-engine-win64
 		verbose "$SELF" release-engine-linux32
 		verbose "$SELF" release-engine-linux64
 		;;