Overlay/games-fps/urbanterror/files/urbanterror-4.2.017-build.p...

76 lines
2.1 KiB
Diff

Author: hasufell <hasufell@gentoo.org>
Date: Wed Jul 10 01:25:27 2013 +0200
respect CFLAGS/LDFLAGS
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,7 @@
endif
endif
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
ifeq ($(USE_OPENAL),1)
BASE_CFLAGS += -DUSE_OPENAL=1
@@ -239,19 +239,15 @@
BASE_CFLAGS += -I/usr/X11R6/include
endif
- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+ OPTIMIZE =
ifeq ($(ARCH),x86_64)
- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
- -fstrength-reduce
+ OPTIMIZE =
# experimental x86_64 jit compiler! you need GNU as
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),i386)
- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
- -funroll-loops -falign-loops=2 -falign-jumps=2 \
- -falign-functions=2 -fstrength-reduce
+ OPTIMIZE =
HAVE_VM_COMPILED=true
else
ifeq ($(ARCH),ppc)
@@ -265,7 +261,7 @@
BASE_CFLAGS += -DNO_VM_COMPILED
endif
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
@@ -274,7 +270,7 @@
SHLIBLDFLAGS=-shared $(LDFLAGS)
THREAD_LDFLAGS=-lpthread
- LDFLAGS=-ldl -lm
+ LDFLAGS+=-ldl -lm
ifeq ($(USE_SDL),1)
CLIENT_LDFLAGS=$(shell sdl-config --libs)
@@ -1158,13 +1154,13 @@
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
$(echo_cmd) "LD $@"
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
- $(LDFLAGS) $(LIBSDLMAIN)
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \
+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
$(echo_cmd) "LD $@"
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
ifneq ($(strip $(LIBSDLMAIN)),)
ifneq ($(strip $(LIBSDLMAINSRC)),)