-
-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14736 from AndersonTorres/higan
higan: 096 -> 098
- Loading branch information
Showing
3 changed files
with
39 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,23 @@ | ||
diff -rupN higan_v095-source.orig/GNUmakefile higan_v095-source/GNUmakefile | ||
--- higan_v095-source.orig/GNUmakefile 2015-11-04 10:28:26.173428178 +0100 | ||
+++ higan_v095-source/GNUmakefile 2015-11-04 10:28:31.752231593 +0100 | ||
@@ -12,7 +12,8 @@ target := tomoko | ||
# console := true | ||
|
||
# compiler | ||
-flags += -I. -O3 | ||
+flags += -I. $(CXXFLAGS) | ||
+link += $(LDFLAGS) | ||
objects := libco | ||
|
||
# profile-guided optimization mode | ||
diff -rupN higan_v095-source.orig/icarus/GNUmakefile higan_v095-source/icarus/GNUmakefile | ||
--- higan_v095-source.orig/icarus/GNUmakefile 2015-11-04 10:28:26.186486119 +0100 | ||
+++ higan_v095-source/icarus/GNUmakefile 2015-11-04 10:28:48.755059317 +0100 | ||
@@ -1,8 +1,8 @@ | ||
include ../nall/GNUmakefile | ||
include ../hiro/GNUmakefile | ||
|
||
-flags += -I.. -O3 | ||
-link += | ||
+flags += -I.. $(CXXFLAGS) | ||
+link += $(LDFLAGS) | ||
objects := obj/hiro.o obj/icarus.o | ||
objects += $(if $(call streq,$(platform),windows),obj/resource.o) | ||
diff -rupN higan_v097-source.old/higan/GNUmakefile higan_v097-source/higan/GNUmakefile | ||
--- higan_v097-source.old/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100 | ||
+++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100 | ||
@@ -36,7 +36,7 @@ ifeq ($(platform),windows) | ||
else ifeq ($(platform),macosx) | ||
flags += -march=native | ||
else ifneq ($(filter $(platform),linux bsd),) | ||
- flags += -march=native -fopenmp | ||
+ flags += -fopenmp | ||
link += -fopenmp | ||
link += -Wl,-export-dynamic | ||
link += -lX11 -lXext | ||
diff -rupN higan_v097-source.old/nall/GNUmakefile higan_v097-source/nall/GNUmakefile | ||
--- higan_v097-source.old/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100 | ||
+++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100 | ||
@@ -40,8 +40,8 @@ cflags := -x c -std=c99 | ||
objcflags := -x objective-c -std=c99 | ||
cppflags := -x c++ -std=c++14 | ||
objcppflags := -x objective-c++ -std=c++14 | ||
-flags := | ||
-link := | ||
+flags := $(CXXFLAGS) | ||
+link := $(LDFLAGS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters