q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-21 19:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore .x86 to Linux and macOS client/server executable names.

Browse source
This commit is contained in:
zturtleman 2018-08-08 15:57:53 +00:00
parent 463403094a
commit 5405ce69d4
5 changed files with 17 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/Makefile
View file

@ -990,12 +990,14 @@ endif
TARGETS = TARGETS =
ifndef FULLBINEXT ifndef FULLBINEXT
# Leave .x86 off win32 binaries
ifeq ($(ARCH),x86)
FULLBINEXT=$(BINEXT)
else
FULLBINEXT=.$(ARCH)$(BINEXT) FULLBINEXT=.$(ARCH)$(BINEXT)
endif
# Leave .x86 off win32 binaries
ifdef MINGW
ifeq ($(ARCH),x86)
FULLBINEXT=$(BINEXT)
endif
endif
endif endif
ifndef SHLIBNAME ifndef SHLIBNAME

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.1.2 r234" #define PRODUCT_VERSION "v0.0.1.2 r235"
#endif #endif
#ifndef PRODUCT_DATE #ifndef PRODUCT_DATE

27
engine/make-linux-portable.sh
View file

@ -151,19 +151,11 @@ if [ $VERBOSE -eq 1 ] ; then
# Find glibc lines, remove text before GLIBC, then sort by required glibc version # 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" # "sort -t _ -k 2 -V" is short form of "sort --field-separator='_' --key=2 --version-sort"
echo echo
if [ "$ARCH" = "x86" ] ; then echo "q3rally-server.$ARCH:"
echo "q3rally-server:" objdump -T build/release-linux-$ARCH/q3rally-server.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
objdump -T build/release-linux-$ARCH/q3rally-server | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V echo
echo echo "q3rally.$ARCH:"
echo "q3rally:" objdump -T build/release-linux-$ARCH/q3rally.$ARCH | grep GLIBC | sed -e "s/.*GLIBC_/GLIBC_/g" | sort -t _ -k 2 -V
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 echo
echo "renderer_opengl1_$ARCH.so:" 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 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 # 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" # "sort -uV" is short form of "sort --unique --version-sort"
if [ "$ARCH" = "x86" ] ; then 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_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.$ARCH | 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_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_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_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) 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)

8
run-debug.sh
View file

@ -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/` ARCH=`uname -m | sed -e s/i.86/x86/`
BUILD=debug BUILD=debug
if [ $ARCH = "x86" ]; then BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
FULLBINEXT=
else
FULLBINEXT=.$ARCH
fi
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally$FULLBINEXT
if [ ! -f $BIN ]; then if [ ! -f $BIN ]; then
echo "Game binary '$BIN' not found, building it..." echo "Game binary '$BIN' not found, building it..."

8
run.sh
View file

@ -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/` ARCH=`uname -m | sed -e s/i.86/x86/`
BUILD=release BUILD=release
if [ $ARCH = "x86" ]; then BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
FULLBINEXT=
else
FULLBINEXT=.$ARCH
fi
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally$FULLBINEXT
if [ ! -f $BIN ]; then if [ ! -f $BIN ]; then
echo "Game binary '$BIN' not found, building it..." echo "Game binary '$BIN' not found, building it..."