From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 26 Apr 2010 20:48:32 +0000 (+0200)
Subject: Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~480
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8f10e29d659231bc3ec3896fde9b1322c905ffa7;hp=-c

Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
---

8f10e29d659231bc3ec3896fde9b1322c905ffa7
diff --combined all
index 15a98b79,a96e8880..729cce22
--- a/all
+++ b/all
@@@ -352,25 -352,6 +352,25 @@@ case "$cmd" i
  		done
  		;;
  	compile)
 +		if [ -n "$WE_HATE_OUR_USERS" ]; then
 +			TARGETS="sv-debug cl-debug"
 +		else
 +			TARGETS="sv-debug cl-debug sdl-debug"
 +		fi
 +		case "$1" in
 +			sdl)
 +				TARGETS="sdl-debug"
 +				shift
 +				;;
 +			glx|agl|wgl)
 +				TARGETS="cl-debug"
 +				shift
 +				;;
 +			dedicated)
 +				TARGETS="sv-debug"
 +				shift
 +				;;
 +		esac
  		if [ -z "$MAKEFLAGS" ]; then
  			if [ -f /proc/cpuinfo ]; then
  				ncpus=$((`grep -c '^processor	:' /proc/cpuinfo`+0))
@@@ -384,13 -365,16 +384,14 @@@
  		enter "$d0/data/xonotic-data.pk3dir" verbose
  		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
  		enter "$d0/darkplaces" verbose
 -		verbose make $MAKEFLAGS sv-debug
 -		verbose make $MAKEFLAGS cl-debug
 -		if ! [ -n "$WE_HATE_OUR_USERS" ]; then
 -			verbose make $MAKEFLAGS sdl-debug
 -		fi
 +		for T in $TARGETS; do
 +			verbose make $MAKEFLAGS "$T"
 +		done
  		;;
  	run)
  		if [ -n "$WE_HATE_OUR_USERS" ]; then
  			client=
+ 			export PATH="$d0/misc/buildfiles/w32:$PATH"
  		else
  			client=-sdl
  		fi