From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 8 Oct 2010 19:45:54 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~21
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=54d203c9b171a752a11f3e00bedb8420438b26c0

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

54d203c9b171a752a11f3e00bedb8420438b26c0
diff --cc all
index 12d312af,282a6903..38c19007
--- a/all
+++ b/all
@@@ -521,11 -573,32 +574,34 @@@ case "$cmd" i
  		done
  		;;
  	compile)
++		cleand0=false
+ 		cleandp=false
+ 		cleanqcc=false
+ 		cleanqc=false
+ 		debug=debug
+ 		while :; do
+ 			case "$1" in
+ 				-c)
++					cleand0=true
+ 					cleandp=true
+ 					cleanqcc=true
+ 					cleanqc=true
+ 					shift
+ 					;;
+ 				-r)
+ 					debug=release
+ 					shift
+ 					;;
+ 				*)
+ 					break
+ 					;;
+ 			esac
+ 		done
  		if [ -z "$CC" ]; then
- 			export CC="gcc -DSUPPORT_IPV6"
+ 			export CC="gcc -DSUPPORTIPV6"
  		fi
  		if [ -n "$WE_HATE_OUR_USERS" ]; then
- 			TARGETS="sv-debug cl-debug"
+ 			TARGETS="sv-$debug cl-$debug"
  		elif [ x"`uname`" = x"Darwin" ]; then
  			case "`uname -r`" in
  				?.*)