X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=225f448a88a00380e96882a0eda87c692eb0d6ac;hp=19298c8a4463e9c49081e6489b52bf32db927a02;hb=09fb8dba19ee95a58c2be4102faa869fe1fd9278;hpb=e9a0caea55be2963eb28453d7a0786f26441786d

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 19298c8a..225f448a 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -17,7 +17,7 @@ case "$cmd" in
 			if [ ! -f "$mapfile" ] ; then
 				msg "ERROR, $mapfile not found!"
 			else
-				time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
+				verbose measure_time misc/tools/xonotic-map-compiler-optionsfile "$mapfile"
 			fi
 		done
 		;;
@@ -28,7 +28,6 @@ case "$cmd" in
 		cleanqc=false
 		compiled0=false
 		debug=debug
-		snowleopardhack=false
 		if [ -z "$CC" ]; then
 			export CC="gcc"
 		fi
@@ -78,16 +77,7 @@ case "$cmd" in
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			TARGETS="sv-$debug cl-$debug"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			case "`uname -r`" in
-				?.*)
-					TARGETS="sv-$debug cl-$debug sdl-$debug"
-					;;
-				*)
-					# AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
-					snowleopardhack=true
-					TARGETS="sv-$debug sdl-$debug"
-					;;
-			esac
+			TARGETS="sv-$debug sdl-$debug"
 			export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
 		else
 			TARGETS="sv-$debug cl-$debug sdl-$debug"
@@ -105,11 +95,8 @@ case "$cmd" in
 				case "$X" in
 					sdl)
 						TARGETS="$TARGETS sdl-$debug"
-						;;
-					agl)
-						TARGETS="$TARGETS cl-$debug"
-						if $snowleopardhack; then
-							export CC="$CC -arch i386"
+						if [ -n "$WE_HATE_OUR_USERS" ]; then
+							export PATH="$PATH:$d0/misc/builddeps/win32/sdl/bin"
 						fi
 						;;
 					glx|wgl)
@@ -291,7 +278,7 @@ case "$cmd" in
 				client=-$1
 				shift
 				;;
-			sdl|glx|agl)
+			sdl|glx)
 				USE_RLWRAP=no
 				client=-$1
 				shift
@@ -336,7 +323,7 @@ case "$cmd" in
 			set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@"
 		fi
 		rm -f xonotic.core
-		"$@" || true
+		verbose measure_time "$@" || true
 		if [ -f xonotic.core ]; then
 			if yesno "The program has CRASHED. Do you want to examine the core dump?"; then
 				gdb "$binary" xonotic.core
@@ -352,9 +339,9 @@ case "$cmd" in
 		fi
 		;;
 	help)
-		$ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
+		$ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
 		$ECHO "  $SELF update-maps"
-		$ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
+		$ECHO "  $SELF run [sdl|glx|wgl|dedicated] options..."
 		$ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
 		handled=false
 		;;