higan: 104 -> 105
This commit is contained in:
parent
e935fbf43f
commit
ef198c93a8
|
@ -1,23 +1,26 @@
|
||||||
diff -rupN higan_v097-source.old/higan/GNUmakefile higan_v097-source/higan/GNUmakefile
|
diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile
|
||||||
--- higan_v097-source.old/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100
|
--- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300
|
||||||
+++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100
|
+++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200
|
||||||
@@ -36,7 +36,7 @@ ifeq ($(platform),windows)
|
@@ -26,7 +26,7 @@
|
||||||
else ifeq ($(platform),macosx)
|
flags += -fopenmp
|
||||||
flags += -march=native
|
|
||||||
else ifneq ($(filter $(platform),linux bsd),)
|
|
||||||
- flags += -march=native -fopenmp
|
|
||||||
+ flags += -fopenmp
|
|
||||||
link += -fopenmp
|
link += -fopenmp
|
||||||
link += -Wl,-export-dynamic
|
ifeq ($(binary),application)
|
||||||
link += -lX11 -lXext
|
- flags += -march=native
|
||||||
diff -rupN higan_v097-source.old/nall/GNUmakefile higan_v097-source/nall/GNUmakefile
|
+ flags +=
|
||||||
--- higan_v097-source.old/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100
|
link += -Wl,-export-dynamic
|
||||||
+++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100
|
link += -lX11 -lXext
|
||||||
@@ -40,8 +40,8 @@ cflags := -x c -std=c99
|
else ifeq ($(binary),library)
|
||||||
objcflags := -x objective-c -std=c99
|
diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile
|
||||||
|
--- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300
|
||||||
|
+++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200
|
||||||
|
@@ -40,8 +40,8 @@
|
||||||
|
objcflags := -x objective-c -std=c11
|
||||||
cppflags := -x c++ -std=c++14
|
cppflags := -x c++ -std=c++14
|
||||||
objcppflags := -x objective-c++ -std=c++14
|
objcppflags := -x objective-c++ -std=c++14
|
||||||
-flags :=
|
-flags :=
|
||||||
-link :=
|
-link :=
|
||||||
+flags := $(CXXFLAGS)
|
+flags := $(CXXFLAGS)
|
||||||
+link := $(LDFLAGS)
|
+link := $(LDFLAGS)
|
||||||
|
|
||||||
|
# compiler detection
|
||||||
|
ifeq ($(compiler),)
|
||||||
|
|
|
@ -10,12 +10,12 @@ with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
name = "higan-${version}";
|
name = "higan-${version}";
|
||||||
version = "104";
|
version = "105";
|
||||||
sourceName = "higan_v${version}-source";
|
sourceName = "higan_v${version}-source";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [ "http://download.byuu.org/${sourceName}.7z" ];
|
urls = [ "http://download.byuu.org/${sourceName}.7z" ];
|
||||||
sha256 = "0i2ma8zjjxadq4368n4m41vhmrb62na6s7pi219ajdsb96x0091l";
|
sha256 = "1lpj345vlnwcywhzq1fzxwl08zc2x4d103rgyyp7yw8m0f8f9sdl";
|
||||||
curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
|
curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -81,8 +81,3 @@ stdenv.mkDerivation rec {
|
||||||
platforms = with platforms; unix;
|
platforms = with platforms; unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# TODO:
|
|
||||||
# - fix the BML and BIOS paths - maybe submitting
|
|
||||||
# a custom patch to upstream would not be a bad idea...
|
|
||||||
|
|
Loading…
Reference in a new issue