From: Mario <mario@smbclan.net>
Date: Mon, 1 Oct 2018 09:48:17 +0000 (+1000)
Subject: Attempt to detect when X64 Windows is being used
X-Git-Tag: xonotic-v0.8.5~148^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=916a92dcc938153256cdbb5fc6925e5123bb0605;p=xonotic%2Fxonotic.git

Attempt to detect when X64 Windows is being used
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 1c24f3bf..3b9b3935 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -139,7 +139,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 +202,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 +301,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"