X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=9118c5054d6219e414be2692363a4028ae66ac3f;hp=1c24f3bfb190121e0f65a8c1b966fb3bfb984cbb;hb=4331b691c0e4073402529c9de16fe57d38e3edfb;hpb=06ce68022c300cccc41414a18323f6c837eac1ca

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 1c24f3bf..9118c505 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -83,11 +83,9 @@ case "$cmd" in
 			esac
 		done
 
+		TARGETS="sv-$debug sdl-$debug"
 		if [ x"`uname`" = x"Darwin" ]; then
-			TARGETS="sv-$debug sdl-$debug"
 			export CC="$CC -fno-reorder-blocks"
-		else
-			TARGETS="sv-$debug cl-$debug sdl-$debug"
 		fi
 
 		if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -104,9 +102,6 @@ case "$cmd" in
 					sdl)
 						TARGETS="$TARGETS sdl-$debug"
 						;;
-					glx|wgl)
-						TARGETS="$TARGETS cl-$debug"
-						;;
 					dedicated)
 						TARGETS="$TARGETS sv-$debug"
 						;;
@@ -139,7 +134,14 @@ case "$cmd" in
 
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			# win32: use SDL2
-			MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
+			case `uname -m` in
+				x86_64)
+					MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win64/sdl/bin/sdl2-config"
+					;;
+				*)
+					MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
+					;;
+			esac
 
 			# win32: don't rely on jpeg includes
 			MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
@@ -195,10 +197,20 @@ case "$cmd" in
 			# 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/libd0_rijndael"-* .libs/
-				verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
-				compiled0=false
+				case `uname -m` in
+					x86_64)
+						verbose cp "$d0/misc/buildfiles/win64/libd0_blind_id"-* .libs/
+						verbose cp "$d0/misc/buildfiles/win64/libd0_rijndael"-* .libs/
+						verbose cp "$d0/misc/buildfiles/win64/libgmp"-* .libs/
+						compiled0=false
+						;;
+					*)
+						verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
+						verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/
+						verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
+						compiled0=false
+						;;
+				esac
 			else
 				case "`uname`" in
 					Linux)
@@ -284,7 +296,14 @@ case "$cmd" in
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
-			export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
+			case `uname -m` in
+				x86_64)
+					export PATH="$d0/misc/buildfiles/win64:$d0/d0_blind_id/.libs:$PATH"
+					;;
+				*)
+					export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
+					;;
+			esac
 		elif [ x"`uname`" = x"Darwin" ]; then
 			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS:$d0/d0_blind_id/.libs"
 			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
@@ -298,16 +317,11 @@ case "$cmd" in
 				client=-$1
 				shift
 				;;
-			sdl|glx)
+			sdl)
 				USE_RLWRAP=no
 				client=-$1
 				shift
 				;;
-			wgl)
-				USE_RLWRAP=no
-				client=
-				shift
-				;;
 		esac
 		if ! [ -x "darkplaces/darkplaces$client" ]; then
 			if [ -x "darkplaces/darkplaces$client.exe" ]; then
@@ -359,9 +373,9 @@ case "$cmd" in
 		fi
 		;;
 	help)
-		$ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
+		$ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|dedicated]"
 		$ECHO "  $SELF update-maps"
-		$ECHO "  $SELF run [sdl|glx|wgl|dedicated] options..."
+		$ECHO "  $SELF run [sdl|dedicated] options..."
 		$ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
 		handled=false
 		;;