mirror of
https://github.com/RGBCube/serenity
synced 2025-10-31 10:52:44 +00:00
ce8d410f36
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.
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jesse Buhagiar <jooster669@gmail.com>
|
|
Date: Fri, 25 Mar 2022 22:04:17 +1100
|
|
Subject: [PATCH] Meta: Remove extension from main game exe
|
|
|
|
---
|
|
Makefile | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index c5a27ab..c0e6200 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1038,12 +1038,12 @@ endif
|
|
|
|
ifneq ($(BUILD_CLIENT),0)
|
|
ifneq ($(USE_RENDERER_DLOPEN),0)
|
|
- TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT) $(B)/renderer_opengl1_$(SHLIBNAME)
|
|
+ TARGETS += $(B)/$(CLIENTBIN) $(B)/renderer_opengl1_$(SHLIBNAME)
|
|
ifneq ($(BUILD_RENDERER_OPENGL2),0)
|
|
TARGETS += $(B)/renderer_opengl2_$(SHLIBNAME)
|
|
endif
|
|
else
|
|
- TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT)
|
|
+ TARGETS += $(B)/$(CLIENTBIN)
|
|
ifneq ($(BUILD_RENDERER_OPENGL2),0)
|
|
TARGETS += $(B)/$(CLIENTBIN)_opengl2$(FULLBINEXT)
|
|
endif
|
|
@@ -2238,7 +2238,7 @@ ifeq ($(USE_MUMBLE),1)
|
|
endif
|
|
|
|
ifneq ($(USE_RENDERER_DLOPEN),0)
|
|
-$(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
|
|
+$(B)/$(CLIENTBIN): $(Q3OBJ) $(LIBSDLMAIN)
|
|
$(echo_cmd) "LD $@"
|
|
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
|
|
-o $@ $(Q3OBJ) \
|
|
@@ -2254,7 +2254,7 @@ $(B)/renderer_opengl2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ)
|
|
$(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) \
|
|
$(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS)
|
|
else
|
|
-$(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(LIBSDLMAIN)
|
|
+$(B)/$(CLIENTBIN): $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(LIBSDLMAIN)
|
|
$(echo_cmd) "LD $@"
|
|
$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
|
|
-o $@ $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) \
|
|
@@ -2937,7 +2937,7 @@ ifneq ($(BUILD_GAME_SO),0)
|
|
endif
|
|
|
|
ifneq ($(BUILD_CLIENT),0)
|
|
- $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(CLIENTBIN)$(FULLBINEXT) $(COPYBINDIR)/$(CLIENTBIN)$(FULLBINEXT)
|
|
+ $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(CLIENTBIN) $(COPYBINDIR)/$(CLIENTBIN)
|
|
ifneq ($(USE_RENDERER_DLOPEN),0)
|
|
$(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl1_$(SHLIBNAME)
|
|
ifneq ($(BUILD_RENDERER_OPENGL2),0)
|