diff options
Diffstat (limited to 'games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch')
| -rw-r--r-- | games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch new file mode 100644 index 000000000000..e0c4eb27f539 --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch @@ -0,0 +1,99 @@ +Author: Nils Freydank <holgersson@posteo.de> +Date: Fri Nov 17 20:30:00 2017 +0100 + +Respect CFLAGS, CPPFLAGS etc. This patch is inspired +by hasufell’s patch. + +Edit 2018-03-19: Now with server support! + +--- a/Makefile 2018-03-19 11:00:00.000000000 +0100 ++++ b/Makefile 2018-03-19 11:00:00.000000001 +0100 +@@ -223,7 +223,7 @@ + ifndef USE_ALTGAMMA + # Clearskies - X11-based gamma for Linux + USE_ALTGAMMA=1 +-endif ++ endif + + ifndef USE_SKEETMOD + USE_SKEETMOD=0 +@@ -306,34 +306,33 @@ + CLIENT_EXTRA_FILES= + + ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) +- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ +- -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" ++ BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" + CLIENT_CFLAGS += $(SDL_CFLAGS) + +- OPTIMIZEVM = -O3 +- OPTIMIZE = $(OPTIMIZEVM) -ffast-math ++ OPTIMIZEVM = ++ OPTIMIZE = $(OPTIMIZEVM) + + ifeq ($(ARCH),x86_64) +- OPTIMIZEVM = -O3 +- OPTIMIZE = $(OPTIMIZEVM) -ffast-math ++ OPTIMIZEVM = ++ OPTIMIZE = $(OPTIMIZEVM) + HAVE_VM_COMPILED = true + else + ifeq ($(ARCH),x86) +- OPTIMIZEVM = -O3 -march=i586 +- OPTIMIZE = $(OPTIMIZEVM) -ffast-math ++ OPTIMIZEVM = ++ OPTIMIZE = $(OPTIMIZEVM) + HAVE_VM_COMPILED=true + else + ifeq ($(ARCH),ppc) +- BASE_CFLAGS += -maltivec ++ BASE_CFLAGS += + HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),ppc64) +- BASE_CFLAGS += -maltivec ++ BASE_CFLAGS += + HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),sparc) +- OPTIMIZE += -mtune=ultrasparc3 -mv8plus +- OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus ++ OPTIMIZE += ++ OPTIMIZEVM += + HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),armv7l) +@@ -1130,12 +1129,12 @@ + + define DO_CC + $(echo_cmd) "CC $<" +-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< ++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< + endef + + define DO_REF_CC + $(echo_cmd) "REF_CC $<" +-$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< ++$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< + endef + + define DO_REF_STR +@@ -1148,7 +1147,7 @@ + + define DO_BOT_CC + $(echo_cmd) "BOT_CC $<" +-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< ++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< + endef + + ifeq ($(GENERATE_DEPENDENCIES),1) +@@ -1162,7 +1161,7 @@ + + define DO_DED_CC + $(echo_cmd) "DED_CC $<" +-$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< ++$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< + endef + + define DO_WINDRES + |