| 1 |
hasufell 14/02/23 03:27:17 |
| 2 |
|
| 3 |
Added: higan-094-QA.patch |
| 4 |
Log: |
| 5 |
version bump wrt #501520 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-emulation/higan/files/higan-094-QA.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/higan/files/higan-094-QA.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/higan/files/higan-094-QA.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: higan-094-QA.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Sun Jun 9 10:23:38 UTC 2013 |
| 19 |
Subject: |
| 20 |
|
| 21 |
--- a/Makefile |
| 22 |
+++ b/Makefile |
| 23 |
@@ -13,8 +13,8 @@ |
| 24 |
# console := true |
| 25 |
|
| 26 |
# compiler |
| 27 |
-flags += -I. -O3 -fomit-frame-pointer |
| 28 |
-link += |
| 29 |
+flags += -I. |
| 30 |
+link += $(LDFLAGS) |
| 31 |
objects := libco |
| 32 |
|
| 33 |
# profile-guided optimization mode |
| 34 |
@@ -41,14 +41,12 @@ |
| 35 |
endif |
| 36 |
link += -s -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32 |
| 37 |
link += -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc |
| 38 |
-else ifeq ($(platform),macosx) |
| 39 |
- flags += -march=native |
| 40 |
else ifeq ($(platform),linux) |
| 41 |
- flags += -march=native |
| 42 |
- link += -s -Wl,-export-dynamic -lX11 -lXext -ldl |
| 43 |
+ flags += |
| 44 |
+ link += -Wl,-export-dynamic -lX11 -lXext -ldl |
| 45 |
else ifeq ($(platform),bsd) |
| 46 |
- flags += -march=native |
| 47 |
- link += -s -Wl,-export-dynamic -lX11 -lXext |
| 48 |
+ flags += |
| 49 |
+ link += -Wl,-export-dynamic -lX11 -lXext |
| 50 |
else |
| 51 |
$(error unsupported platform.) |
| 52 |
endif |
| 53 |
@@ -59,9 +57,9 @@ |
| 54 |
compile = \ |
| 55 |
$(strip \ |
| 56 |
$(if $(filter %.c,$<), \ |
| 57 |
- $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \ |
| 58 |
+ $(compiler) $(cflags) $(flags) $(CFLAGS) $1 -c $< -o $@, \ |
| 59 |
$(if $(filter %.cpp,$<), \ |
| 60 |
- $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \ |
| 61 |
+ $(compiler) $(cppflags) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \ |
| 62 |
) \ |
| 63 |
) \ |
| 64 |
) |
| 65 |
--- a/target-ethos/Makefile |
| 66 |
+++ b/target-ethos/Makefile |
| 67 |
@@ -55,10 +55,10 @@ |
| 68 |
obj/ui-tools.o: $(ui)/tools/tools.cpp $(call rwildcard,$(ui)/) |
| 69 |
|
| 70 |
obj/ruby.o: ruby/ruby.cpp $(call rwildcard,ruby/*) |
| 71 |
- $(compiler) $(rubyflags) -c $< -o $@ |
| 72 |
+ $(compiler) $(rubyflags) $(CXXFLAGS) -c $< -o $@ |
| 73 |
|
| 74 |
obj/phoenix.o: phoenix/phoenix.cpp $(call rwildcard,phoenix/*) |
| 75 |
- $(compiler) $(phoenixflags) -c $< -o $@ |
| 76 |
+ $(compiler) $(phoenixflags) $(CXXFLAGS) -c $< -o $@ |
| 77 |
|
| 78 |
obj/resource.o: $(ui)/resource.rc |
| 79 |
ifeq ($(arch),win32) |
| 80 |
@@ -82,7 +82,7 @@ |
| 81 |
sips -s format icns data/higan.png --out out/$(name).app/Contents/Resources/higan.icns |
| 82 |
$(strip $(compiler) -o out/$(name).app/Contents/MacOS/$(name) $(objects) $(link)) |
| 83 |
else |
| 84 |
- $(strip $(compiler) -o out/$(name) $(objects) $(link)) |
| 85 |
+ $(strip $(CXX) $(CXXFLAGS) -o out/$(name) $(objects) $(link)) |
| 86 |
endif |
| 87 |
|
| 88 |
resource: |
| 89 |
--- a/nall/Makefile |
| 90 |
+++ b/nall/Makefile |
| 91 |
@@ -53,11 +53,11 @@ |
| 92 |
link := |
| 93 |
endif |
| 94 |
|
| 95 |
- cflags := -x c -std=c99 |
| 96 |
- objcflags := -x objective-c -std=c99 |
| 97 |
- cppflags := -x c++ -std=c++11 |
| 98 |
- objcppflags := -x objective-c++ -std=c++11 |
| 99 |
endif |
| 100 |
+cflags := -x c -std=c99 |
| 101 |
+objcflags := -x objective-c -std=c99 |
| 102 |
+cppflags := -x c++ -std=c++11 |
| 103 |
+objcppflags := -x objective-c++ -std=c++11 |
| 104 |
|
| 105 |
# cross-compilation support |
| 106 |
ifeq ($(arch),x86) |
Archives