X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=f7e1c97b4ba5a8a77d97052ba65c5e6fa6efcfcb;hb=ddc40ead6295e4551406b5e7c6bf2aa68e6f4296;hp=9920ed88b53a27fb7621717c687adeee212fb0ad;hpb=ad132d8e512fcfbf1e156803350e91d61155b51b;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 9920ed88..f7e1c97b 100755
--- a/all
+++ b/all
@@ -117,7 +117,7 @@ data/xonotic-nexcompat.pk3dir |
 darkplaces                    |                                                   | div0-stable | svn
 netradiant                    |                                                   | master      |
 div0-gittools                 |                                                   | master      | no
-d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
+d0_blind_id                   | git://github.com/divVerent/d0_blind_id.git        | master      |
 data/xonotic-maps.pk3dir      |                                                   | master      |
 mediasource                   |                                                   | master      | no
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
@@ -351,10 +351,34 @@ case "$cmd" in
 		;;
 	update|pull)
 		allow_pull=true
-		if [ x"$1" = x"-N" ]; then
-			allow_pull=false
+		fix_config=false
+		while :; do
+			if [ x"$1" = x"-N" ]; then
+				allow_pull=false
+			elif [ x"$1" = x"-p" ]; then
+				fix_config=true
+				pushbase=ssh://xonotic@git.xonotic.org/
+			elif [ x"$1" = x"-s" ]; then
+				fix_config=true
+				base=ssh://xonotic@git.xonotic.org/
+				pushbase=
+			elif [ x"$1" = x"-g" ]; then
+				fix_config=true
+				base=git://git.xonotic.org/xonotic/
+			elif [ x"$1" = x"-h" ]; then
+				fix_config=true
+				base=http://git.xonotic.org/xonotic/
+			else
+				break
+			fi
+			shift
+		done
+		if $fix_config; then
+			url=`repourl .`
+			pushurl=`repopushurl .`
+			fix_git_config "$url" "$pushurl"
 		fi
-		if $allow_pull; then
+		if $allow_pull || $fix_config; then
 			"$SELF" fix_config
 		fi
 		for d in $repos; do
@@ -579,12 +603,16 @@ case "$cmd" in
 		cleandp=false
 		cleanqcc=false
 		cleanqc=false
+		compiled0=false
 		debug=debug
 		if [ -z "$CC" ]; then
 			export CC="gcc -DSUPPORTIPV6"
 		fi
 		while :; do
 			case "$1" in
+				-0)
+					compiled0=true
+					;;
 				-c)
 					cleand0=true
 					cleandp=true
@@ -663,14 +691,53 @@ case "$cmd" in
 		fi
 
 		enter "$d0/d0_blind_id" verbose
-		if $cleand0; then
-			verbose make $MAKEFLAGS distclean
+		if ! $compiled0; then
+			# compilation of crypto library failed
+			# use binaries then, if we can...
+			mkdir -p .libs
+			if [ -n "$WE_HATE_OUR_USERS" ]; then
+				verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
+				verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
+			else
+				case "`uname`" in
+					Linux)
+						case `uname -m` in
+							x86_64)
+								verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/
+								verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/
+								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/"
+								;;
+							*86)
+								verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
+								verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
+								MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/"
+								;;
+							*)
+								compiled0=true
+								;;
+						esac
+						;;
+					Darwin)
+						verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/
+						;;
+					*)
+						compiled0=true
+						;;
+				esac
+			fi
 		fi
-		if ! [ -f Makefile ]; then
-			verbose sh autogen.sh
-			verbose ./configure
+		if $compiled0; then
+			if $cleand0; then
+				if [ -f Makefile ]; then
+					verbose make $MAKEFLAGS distclean
+				fi
+			fi
+			if ! [ -f Makefile ]; then
+				verbose sh autogen.sh
+				verbose ./configure
+			fi
+			verbose make $MAKEFLAGS
 		fi
-		verbose make $MAKEFLAGS
 
 		enter "$d0/fteqcc" verbose
 		if $cleanqcc; then