74 lines
1.9 KiB
Diff
74 lines
1.9 KiB
Diff
|
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.
|
|||
|
|
|
|||
|
|
--- a/Makefile 2017-03-31 11:08:58.419210817 +0200
|
|||
|
|
+++ b/Makefile 2017-11-17 20:30:00.000000000 +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)
|
|||
|
|
@@ -1124,7 +1123,7 @@
|
|||
|
|
|
|||
|
|
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
|
|||
|
|
|