diff options
Diffstat (limited to 'games/higan/higan-flags.diff')
-rw-r--r-- | games/higan/higan-flags.diff | 66 |
1 files changed, 46 insertions, 20 deletions
diff --git a/games/higan/higan-flags.diff b/games/higan/higan-flags.diff index 890a2c0bc2..aaca8d0e2f 100644 --- a/games/higan/higan-flags.diff +++ b/games/higan/higan-flags.diff @@ -1,23 +1,49 @@ -From 6d0f100d25fecae89a48c76f55371730a51c10fe Mon Sep 17 00:00:00 2001 -From: Maxime Gauduin <alucryd@archlinux.org> -Date: Wed, 18 Mar 2020 17:08:25 +0100 -Subject: [PATCH] use system flags - ---- - nall/GNUmakefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/nall/GNUmakefile b/nall/GNUmakefile -index 67fb3a15..fddec93d 100755 ---- a/nall/GNUmakefile -+++ b/nall/GNUmakefile -@@ -127,7 +127,8 @@ endif +diff -rupN higan_v106-source.orig/higan/GNUmakefile higan_v106-source/higan/GNUmakefile +--- higan_v106-source.orig/higan/GNUmakefile 2017-12-27 23:12:21.263872763 +0100 ++++ higan_v106-source/higan/GNUmakefile 2017-12-27 23:12:30.243627883 +0100 +@@ -1,4 +1,4 @@ +-build := optimize ++build := release + include ../nall/GNUmakefile - # linux settings - ifeq ($(platform),linux) -- options += -ldl -+ flags += ${CXXFLAGS} -+ options += ${LDFLAGS} -ldl + binary := application +@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux b + flags += -fopenmp + link += -fopenmp + ifeq ($(binary),application) +- flags += -march=native + link += -Wl,-export-dynamic + link += -lX11 -lXext + else ifeq ($(binary),library) +diff -rupN higan_v106-source.orig/icarus/GNUmakefile higan_v106-source/icarus/GNUmakefile +--- higan_v106-source.orig/icarus/GNUmakefile 2017-12-27 23:12:21.280538976 +0100 ++++ higan_v106-source/icarus/GNUmakefile 2017-12-27 23:12:30.243627883 +0100 +@@ -1,4 +1,4 @@ +-build := optimize ++build := release + include ../nall/GNUmakefile + include ../hiro/GNUmakefile + +diff -rupN higan_v106-source.orig/nall/GNUmakefile higan_v106-source/nall/GNUmakefile +--- higan_v106-source.orig/nall/GNUmakefile 2017-12-27 23:12:21.283872217 +0100 ++++ higan_v106-source/nall/GNUmakefile 2017-12-27 23:12:44.326577547 +0100 +@@ -40,8 +40,8 @@ cflags := -x c -std=c11 + objcflags := -x objective-c -std=c11 + cppflags := -x c++ -std=c++14 + objcppflags := -x objective-c++ -std=c++14 +-flags := +-link := ++flags := $(CXXFLAGS) ++link := $(LDFLAGS) + + # compiler detection + ifeq ($(compiler),) +@@ -120,7 +120,7 @@ ifeq ($(threaded),true) endif - # bsd settings + # paths +-prefix := $(HOME)/.local ++prefix := /usr + + # function rwildcard(directory, pattern) + rwildcard = \ |