yquake2
/
ctf
mirror of https://github.com/yquake2/ctf.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Normalize arm64 to aarch 64 on not MacOS and Windows. 

This makes sure that 64 bit and 32 bit aren't endig up as `arm`, making
it possible to load 32 bit savegames on 64 bit binaries and vise versa.
This is a theoretical issue with ctf, because the mod doesn't support
savegames.

For MacOS just use what the system calls itself.

Closes #18.
This commit is contained in:
Yamagi 2023-11-04 14:05:02 +01:00
parent 4bbda4cd98
commit 95852c466c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -47,8 +47,12 @@ YQ2_ARCH ?= $(PROCESSOR_ARCHITECTURE)
endif endif
endif # windows but MINGW_CHOST not defined endif # windows but MINGW_CHOST not defined
else else
ifneq ($(YQ2_OSTYPE), Darwin)
# Normalize some abiguous YQ2_ARCH strings # Normalize some abiguous YQ2_ARCH strings
YQ2_ARCH ?= $(shell uname -m | sed -e 's/i.86/i386/' -e 's/amd64/x86_64/' -e 's/^arm.*/arm/') YQ2_ARCH ?= $(shell uname -m | sed -e 's/i.86/i386/' -e 's/amd64/x86_64/' -e 's/arm64/aarch64/' -e 's/^arm.*/arm/')
else
YQ2_ARCH ?= $(shell uname -m)
endif
endif endif
# On Windows / MinGW $(CC) is undefined by default. # On Windows / MinGW $(CC) is undefined by default.