| 1 |
hasufell 13/09/28 13:58:52 |
| 2 |
|
| 3 |
Added: urbanterror-4.2.015-build.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-fps/urbanterror/files/urbanterror-4.2.015-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.015-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.015-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: urbanterror-4.2.015-build.patch |
| 16 |
=================================================================== |
| 17 |
commit dc89402ef3305202a2ec51e6c2c073bb1f65fb54 |
| 18 |
Author: hasufell <hasufell@g.o> |
| 19 |
Date: Wed Jul 10 01:25:27 2013 +0200 |
| 20 |
|
| 21 |
respect CFLAGS/LDFLAGS |
| 22 |
|
| 23 |
diff --git a/Makefile b/Makefile |
| 24 |
index 3c134d5..54989f3 100644 |
| 25 |
--- a/Makefile |
| 26 |
+++ b/Makefile |
| 27 |
@@ -213,7 +213,7 @@ ifeq ($(PLATFORM),linux) |
| 28 |
endif |
| 29 |
endif |
| 30 |
|
| 31 |
- BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -pipe |
| 32 |
+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes |
| 33 |
|
| 34 |
ifeq ($(USE_OPENAL),1) |
| 35 |
BASE_CFLAGS += -DUSE_OPENAL=1 |
| 36 |
@@ -238,18 +238,17 @@ ifeq ($(PLATFORM),linux) |
| 37 |
else |
| 38 |
BASE_CFLAGS += -I/usr/X11R6/include |
| 39 |
endif |
| 40 |
- #Anything more then -O2 and *mmx *msse/2/ causes hitching with urbanterror\ |
| 41 |
-#also -march is illrelavent unless you know your target cpu |
| 42 |
- OPTIMIZE = -O2 -mmmx -msse -msse2 -msse3 |
| 43 |
+ # what an idiotic comment |
| 44 |
+ OPTIMIZE = |
| 45 |
#having x86_x64 implys having full SSE support up to SSE3 so we will use it,\ |
| 46 |
#for old cpus we don't care because anything pre Pentium 4/Althlon 1600+ won't run UrbanTerror |
| 47 |
ifeq ($(ARCH),x86_64) |
| 48 |
- OPTIMIZE = -O2 -msse -msse2 -msse3 |
| 49 |
+ OPTIMIZE = |
| 50 |
# experimental x86_64 jit compiler! you need GNU as |
| 51 |
HAVE_VM_COMPILED = true |
| 52 |
else |
| 53 |
ifeq ($(ARCH),i386) |
| 54 |
- OPTIMIZE = -O2 -mmmx |
| 55 |
+ OPTIMIZE = |
| 56 |
|
| 57 |
HAVE_VM_COMPILED=true |
| 58 |
else |
| 59 |
@@ -264,7 +263,7 @@ ifeq ($(PLATFORM),linux) |
| 60 |
BASE_CFLAGS += -DNO_VM_COMPILED |
| 61 |
endif |
| 62 |
|
| 63 |
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -wall |
| 64 |
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) |
| 65 |
|
| 66 |
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) |
| 67 |
|
| 68 |
@@ -273,7 +272,7 @@ ifeq ($(PLATFORM),linux) |
| 69 |
SHLIBLDFLAGS=-shared $(LDFLAGS) |
| 70 |
|
| 71 |
THREAD_LDFLAGS=-lpthread |
| 72 |
- LDFLAGS=-ldl -lm |
| 73 |
+ LDFLAGS+=-ldl -lm |
| 74 |
|
| 75 |
ifeq ($(USE_SDL),1) |
| 76 |
CLIENT_LDFLAGS=$(shell sdl-config --libs) |
| 77 |
@@ -1157,13 +1156,13 @@ endif |
| 78 |
|
| 79 |
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
| 80 |
$(echo_cmd) "LD $@" |
| 81 |
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ |
| 82 |
- $(LDFLAGS) $(LIBSDLMAIN) |
| 83 |
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \ |
| 84 |
+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 85 |
|
| 86 |
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
| 87 |
$(echo_cmd) "LD $@" |
| 88 |
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
| 89 |
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
| 90 |
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ |
| 91 |
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 92 |
|
| 93 |
ifneq ($(strip $(LIBSDLMAIN)),) |
| 94 |
ifneq ($(strip $(LIBSDLMAINSRC)),) |
Archives