mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 11:27:36 +00:00
Ports: Make the quake3 port buildable on ARM64 hosts
Previously, on ARM64 hosts we'd try to build ARM64 binaries even when SERENITY_ARCH was set to x86_64. This would cause the build to fail.
This commit is contained in:
parent
27737f613c
commit
ce8d410f36
4 changed files with 24 additions and 16 deletions
|
@ -4,25 +4,33 @@ Date: Fri, 25 Mar 2022 09:39:21 +1100
|
|||
Subject: [PATCH] Meta: Refactor Makefile to support Serenity
|
||||
|
||||
---
|
||||
Makefile | 36 ++++++++++++++++--------------------
|
||||
1 file changed, 16 insertions(+), 20 deletions(-)
|
||||
Makefile | 44 ++++++++++++++++----------------------------
|
||||
1 file changed, 16 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9e53555..b26ceb7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -3,8 +3,8 @@
|
||||
@@ -3,16 +3,8 @@
|
||||
#
|
||||
# GNU Make required
|
||||
#
|
||||
-COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g')
|
||||
-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/')
|
||||
-
|
||||
-#arm64 hack!
|
||||
-ifeq ($(shell uname -m), arm64)
|
||||
- COMPILE_ARCH=arm64
|
||||
-endif
|
||||
-ifeq ($(shell uname -m), aarch64)
|
||||
- COMPILE_ARCH=arm64
|
||||
-endif
|
||||
+COMPILE_PLATFORM=serenity
|
||||
+COMPILE_ARCH=${SERENITY_ARCH}
|
||||
|
||||
#arm64 hack!
|
||||
ifeq ($(shell uname -m), arm64)
|
||||
@@ -35,13 +35,13 @@ ifndef BUILD_GAME_QVM
|
||||
ifeq ($(COMPILE_PLATFORM),sunos)
|
||||
# Solaris uname and GNU uname differ
|
||||
@@ -35,13 +27,13 @@ ifndef BUILD_GAME_QVM
|
||||
BUILD_GAME_QVM =
|
||||
endif
|
||||
ifndef BUILD_BASEGAME
|
||||
|
@ -39,7 +47,7 @@ index 9e53555..b26ceb7 100644
|
|||
endif
|
||||
ifndef BUILD_AUTOUPDATER # DON'T build unless you mean to!
|
||||
BUILD_AUTOUPDATER=0
|
||||
@@ -164,39 +164,39 @@ GENERATE_DEPENDENCIES=1
|
||||
@@ -164,39 +156,39 @@ GENERATE_DEPENDENCIES=1
|
||||
endif
|
||||
|
||||
ifndef USE_OPENAL
|
||||
|
@ -87,7 +95,7 @@ index 9e53555..b26ceb7 100644
|
|||
endif
|
||||
|
||||
ifndef USE_FREETYPE
|
||||
@@ -505,10 +505,6 @@ ifeq ($(PLATFORM),darwin)
|
||||
@@ -505,10 +497,6 @@ ifeq ($(PLATFORM),darwin)
|
||||
ifeq ($(CROSS_COMPILING),1)
|
||||
# If CC is already set to something generic, we probably want to use
|
||||
# something more specific
|
||||
|
@ -98,7 +106,7 @@ index 9e53555..b26ceb7 100644
|
|||
ifndef CC
|
||||
ifndef DARWIN
|
||||
# macOS 10.9 SDK
|
||||
@@ -817,11 +813,10 @@ ifeq ($(PLATFORM),freebsd)
|
||||
@@ -817,11 +805,10 @@ ifeq ($(PLATFORM),freebsd)
|
||||
else # ifeq freebsd
|
||||
|
||||
#############################################################################
|
||||
|
@ -112,7 +120,7 @@ index 9e53555..b26ceb7 100644
|
|||
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
||||
-pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
|
||||
CLIENT_CFLAGS += $(SDL_CFLAGS)
|
||||
@@ -1000,6 +995,7 @@ ifeq ($(PLATFORM),sunos)
|
||||
@@ -1000,6 +987,7 @@ ifeq ($(PLATFORM),sunos)
|
||||
|
||||
else # ifeq sunos
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue