From: terencehill <piuntn@gmail.com>
Date: Tue, 20 Nov 2018 13:31:04 +0000 (+0100)
Subject: Fix "all run" trying to run a no longer supported executable (wgl or glx), it now... 
X-Git-Tag: xonotic-v0.8.5~142
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6ce9c4ba79282683a9b4069cea50998fa8909da;p=xonotic%2Fxonotic.git

Fix "all run" trying to run a no longer supported executable (wgl or glx), it now runs the sdl one
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 9118c505..5916f5f6 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -161,7 +161,7 @@ case "$cmd" in
 				MAKEFLAGS="$MAKEFLAGS CFLAGS_SSE= CFLAGS_SSE2="
 				;;
 		esac
-		
+
 		if ! verbose $CC misc/tools/conftest.c -o conftest; then
 			msg ""
 			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -295,7 +295,6 @@ case "$cmd" in
 		;;
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
-			client=
 			case `uname -m` in
 				x86_64)
 					export PATH="$d0/misc/buildfiles/win64:$d0/d0_blind_id/.libs:$PATH"
@@ -307,22 +306,23 @@ case "$cmd" in
 		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"
-			client=-sdl
 		else
 			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-			client=-sdl
 		fi
+
+		client=-sdl
+		USE_RLWRAP=no
 		case "$1" in
 			dedicated)
 				client=-$1
+				USE_RLWRAP=
 				shift
 				;;
 			sdl)
-				USE_RLWRAP=no
-				client=-$1
 				shift
 				;;
 		esac
+
 		if ! [ -x "darkplaces/darkplaces$client" ]; then
 			if [ -x "darkplaces/darkplaces$client.exe" ]; then
 				client=$client.exe