From 5405ce69d4bc225b5d1171633c5299b3cbad5ea1 Mon Sep 17 00:00:00 2001
From: zturtleman <zturtleman@b95fa9d2-619b-4617-8743-2613d58f007a>
Date: Wed, 8 Aug 2018 15:57:53 +0000
Subject: [PATCH] Restore .x86 to Linux and macOS client/server executable
 names.

---
 engine/Makefile                | 12 +++++++-----
 engine/code/qcommon/q_shared.h |  2 +-
 engine/make-linux-portable.sh  | 27 +++++++--------------------
 run-debug.sh                   |  8 +-------
 run.sh                         |  8 +-------
 5 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/engine/Makefile b/engine/Makefile
index 01649c52..58e61d24 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -990,12 +990,14 @@ endif
 TARGETS =
 
 ifndef FULLBINEXT
-# Leave .x86 off win32 binaries
-ifeq ($(ARCH),x86)
-  FULLBINEXT=$(BINEXT)
-else
   FULLBINEXT=.$(ARCH)$(BINEXT)
-endif
+
+  # Leave .x86 off win32 binaries
+  ifdef MINGW
+    ifeq ($(ARCH),x86)
+      FULLBINEXT=$(BINEXT)
+    endif
+  endif
 endif
 
 ifndef SHLIBNAME
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index d2429421..e6ae5c06 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.0.1.2 r234"
+#define PRODUCT_VERSION "v0.0.1.2 r235"
 #endif
 
 #ifndef PRODUCT_DATE
diff --git a/engine/make-linux-portable.sh b/engine/make-linux-portable.sh
index 3d8da089..faea7441 100755
--- a/engine/make-linux-portable.sh
+++ b/engine/make-linux-portable.sh
@@ -151,19 +151,11 @@ if [ $VERBOSE -eq 1 ] ; then
 	# Find glibc lines, remove text before GLIBC, then sort by required glibc version
 	# "sort -t _ -k 2 -V" is short form of "sort --field-separator='_' --key=2 --version-sort"
 	echo
-	if [ "$ARCH" = "x86" ] ; then
-		echo "q3rally-server:"
-		objdump -T build/release-linux-$ARCH/q3rally-server | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
-		echo
-		echo "q3rally:"
-		objdump -T build/release-linux-$ARCH/q3rally | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
-	else
-		echo "q3rally-server.$ARCH:"
-		objdump -T build/release-linux-$ARCH/q3rally-server.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
-		echo
-		echo "q3rally.$ARCH:"
-		objdump -T build/release-linux-$ARCH/q3rally.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
-	fi
+	echo "q3rally-server.$ARCH:"
+	objdump -T build/release-linux-$ARCH/q3rally-server.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
+	echo
+	echo "q3rally.$ARCH:"
+	objdump -T build/release-linux-$ARCH/q3rally.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
 	echo
 	echo "renderer_opengl1_$ARCH.so:"
 	objdump -T build/release-linux-$ARCH/renderer_opengl1_$ARCH.so | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
@@ -177,13 +169,8 @@ fi
 
 # Find glibc lines, remove text before and including GLIBC_, remove trailing function name, sort by required glibc version, then grab the last (highest) version
 # "sort -uV" is short form of "sort --unique --version-sort"
-if [ "$ARCH" = "x86" ] ; then
-	GLIBC_SERVER=$(objdump -T build/release-linux-$ARCH/q3rally-server | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
-	GLIBC_C1=$(objdump -T build/release-linux-$ARCH/q3rally | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
-else
-	GLIBC_SERVER=$(objdump -T build/release-linux-$ARCH/q3rally-server.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
-	GLIBC_C1=$(objdump -T build/release-linux-$ARCH/q3rally.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
-fi
+GLIBC_SERVER=$(objdump -T build/release-linux-$ARCH/q3rally-server.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
+GLIBC_C1=$(objdump -T build/release-linux-$ARCH/q3rally.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
 GLIBC_C2=$(objdump -T build/release-linux-$ARCH/renderer_opengl1_$ARCH.so | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
 GLIBC_C3=$(objdump -T build/release-linux-$ARCH/renderer_opengl2_$ARCH.so | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
 GLIBC_C4=$(objdump -T build/release-linux-$ARCH/lib/$ARCH/libSDL2-2.0.so.0 | grep GLIBC | sed -e "s/.*GLIBC_//g" | cut -d' ' -f1 | sort -uV | tail -1)
diff --git a/run-debug.sh b/run-debug.sh
index 0e9697c9..d07f1013 100755
--- a/run-debug.sh
+++ b/run-debug.sh
@@ -5,13 +5,7 @@ PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g'`
 ARCH=`uname -m | sed -e s/i.86/x86/`
 BUILD=debug
 
-if [ $ARCH = "x86" ]; then
-	FULLBINEXT=
-else
-	FULLBINEXT=.$ARCH
-fi
-
-BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally$FULLBINEXT
+BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
 
 if [ ! -f $BIN ]; then
 	echo "Game binary '$BIN' not found, building it..."
diff --git a/run.sh b/run.sh
index 8809848a..f4ed24ab 100755
--- a/run.sh
+++ b/run.sh
@@ -5,13 +5,7 @@ PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g'`
 ARCH=`uname -m | sed -e s/i.86/x86/`
 BUILD=release
 
-if [ $ARCH = "x86" ]; then
-	FULLBINEXT=
-else
-	FULLBINEXT=.$ARCH
-fi
-
-BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally$FULLBINEXT
+BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
 
 if [ ! -f $BIN ]; then
 	echo "Game binary '$BIN' not found, building it..."