* [gentoo-commits] gentoo-x86 commit in games-fps/urbanterror/files: urbanterror-4.2.013-build.patch
@ 2013-07-04 13:54 Julian Ospald (hasufell)
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald (hasufell) @ 2013-07-04 13:54 UTC (permalink / raw
To: gentoo-commits
hasufell 13/07/04 13:54:46
Added: urbanterror-4.2.013-build.patch
Log:
version bump
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 games-fps/urbanterror/files/urbanterror-4.2.013-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?rev=1.1&content-type=text/plain
Index: urbanterror-4.2.013-build.patch
===================================================================
--- Makefile
+++ Makefile
@@ -213,7 +213,7 @@
endif
endif
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
+ BASE_CFLAGS = -Wall -fno-strict-aliasing -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 = -ffast-math -funroll-loops
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 = -ffast-math -funroll-loops
# 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 = -ffast-math -funroll-loops
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)
@@ -1157,13 +1153,13 @@
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
$(echo_cmd) "LD $@"
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
- $(LDFLAGS) $(LIBSDLMAIN)
+ $(Q)$(CC) -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) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
ifneq ($(strip $(LIBSDLMAIN)),)
ifneq ($(strip $(LIBSDLMAINSRC)),)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-fps/urbanterror/files: urbanterror-4.2.013-build.patch
@ 2013-07-09 23:32 Julian Ospald (hasufell)
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald (hasufell) @ 2013-07-09 23:32 UTC (permalink / raw
To: gentoo-commits
hasufell 13/07/09 23:32:16
Modified: urbanterror-4.2.013-build.patch
Log:
revbump to update the game engine
(Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.2 games-fps/urbanterror/files/urbanterror-4.2.013-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch?r1=1.1&r2=1.2
Index: urbanterror-4.2.013-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- urbanterror-4.2.013-build.patch 4 Jul 2013 13:54:46 -0000 1.1
+++ urbanterror-4.2.013-build.patch 9 Jul 2013 23:32:16 -0000 1.2
@@ -1,47 +1,55 @@
---- Makefile
-+++ Makefile
-@@ -213,7 +213,7 @@
+commit dc89402ef3305202a2ec51e6c2c073bb1f65fb54
+Author: hasufell <hasufell@gentoo.org>
+Date: Wed Jul 10 01:25:27 2013 +0200
+
+ respect CFLAGS/LDFLAGS
+
+diff --git a/Makefile b/Makefile
+index 3c134d5..54989f3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -213,7 +213,7 @@ ifeq ($(PLATFORM),linux)
endif
endif
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
+- BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -pipe
++ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
ifeq ($(USE_OPENAL),1)
BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -239,19 +239,15 @@
+@@ -238,18 +238,17 @@ ifeq ($(PLATFORM),linux)
+ else
BASE_CFLAGS += -I/usr/X11R6/include
endif
-
-- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
-+ OPTIMIZE = -ffast-math -funroll-loops
-
- 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 = -ffast-math -funroll-loops
+- #Anything more then -O2 and *mmx *msse/2/ causes hitching with urbanterror\
+-#also -march is illrelavent unless you know your target cpu
+- OPTIMIZE = -O2 -mmmx -msse -msse2 -msse3
++ # what an idiotic comment
++ OPTIMIZE =
+ #having x86_x64 implys having full SSE support up to SSE3 so we will use it,\
+ #for old cpus we don't care because anything pre Pentium 4/Althlon 1600+ won't run UrbanTerror
+ ifeq ($(ARCH),x86_64)
+- OPTIMIZE = -O2 -msse -msse2 -msse3
++ 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 = -ffast-math -funroll-loops
+- OPTIMIZE = -O2 -mmmx
++ OPTIMIZE =
+
HAVE_VM_COMPILED=true
else
- ifeq ($(ARCH),ppc)
-@@ -265,7 +261,7 @@
+@@ -264,7 +263,7 @@ ifeq ($(PLATFORM),linux)
BASE_CFLAGS += -DNO_VM_COMPILED
endif
-- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
+- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -wall
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
-@@ -274,7 +270,7 @@
+@@ -273,7 +272,7 @@ ifeq ($(PLATFORM),linux)
SHLIBLDFLAGS=-shared $(LDFLAGS)
THREAD_LDFLAGS=-lpthread
@@ -50,20 +58,20 @@
ifeq ($(USE_SDL),1)
CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1157,13 +1153,13 @@
+@@ -1157,13 +1156,13 @@ endif
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
$(echo_cmd) "LD $@"
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
- $(LDFLAGS) $(LIBSDLMAIN)
-+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \
++ $(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) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
++ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
ifneq ($(strip $(LIBSDLMAIN)),)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-09 23:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-09 23:32 [gentoo-commits] gentoo-x86 commit in games-fps/urbanterror/files: urbanterror-4.2.013-build.patch Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2013-07-04 13:54 Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox