diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-util/higan-purify/files | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'games-util/higan-purify/files')
| -rw-r--r-- | games-util/higan-purify/files/higan-purify-03-QA.patch | 16 | ||||
| -rw-r--r-- | games-util/higan-purify/files/higan-purify-03-respect-CXX.patch | 28 |
2 files changed, 36 insertions, 8 deletions
diff --git a/games-util/higan-purify/files/higan-purify-03-QA.patch b/games-util/higan-purify/files/higan-purify-03-QA.patch index e523ba4cad95..5b2d1e6c3d3a 100644 --- a/games-util/higan-purify/files/higan-purify-03-QA.patch +++ b/games-util/higan-purify/files/higan-purify-03-QA.patch @@ -1,5 +1,5 @@ ---- purify_v03-source/purify/Makefile -+++ purify_v03-source/purify/Makefile +--- a/Makefile ++++ b/Makefile @@ -2,8 +2,8 @@ include phoenix/Makefile @@ -20,23 +20,23 @@ else ifeq ($(platform),win) windres phoenix/windows/phoenix.rc obj/phoenix-resource.o $(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink) ---- purify_v03-source/purify/phoenix/Makefile -+++ purify_v03-source/purify/phoenix/Makefile +--- a/phoenix/Makefile ++++ b/phoenix/Makefile @@ -4,13 +4,13 @@ endif ifeq ($(phoenix),gtk) - phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0` - phoenixlink := `pkg-config --libs gtk+-2.0` -+ phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0 x11` -+ phoenixlink := `pkg-config --libs gtk+-2.0 x11` -ldl ++ phoenixflags := -DPHOENIX_GTK `${PKG_CONFIG} --cflags gtk+-2.0 x11` ++ phoenixlink := `${PKG_CONFIG} --libs gtk+-2.0 x11` -ldl endif ifeq ($(phoenix),qt) - phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui` - phoenixlink := `pkg-config --libs QtCore QtGui` -+ phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui x11` -+ phoenixlink := `pkg-config --libs QtCore QtGui x11` -ldl ++ phoenixflags := -DPHOENIX_QT `${PKG_CONFIG} --cflags QtCore QtGui x11` ++ phoenixlink := `${PKG_CONFIG} --libs QtCore QtGui x11` -ldl endif else ifeq ($(platform),win) phoenixflags := -DPHOENIX_WINDOWS diff --git a/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch new file mode 100644 index 000000000000..00a6a1e4c69b --- /dev/null +++ b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch @@ -0,0 +1,28 @@ +diff --git a/Makefile b/Makefile +index 2a56366..59a3795 100755 +--- a/Makefile ++++ b/Makefile +@@ -15,18 +15,18 @@ endif + all: build; + + obj/phoenix.o: phoenix/phoenix.cpp +- $(cpp) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags) ++ $(CXX) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags) + + obj/purify.o: purify.cpp +- $(cpp) $(flags) -o obj/purify.o -c purify.cpp ++ $(CXX) $(flags) -o obj/purify.o -c purify.cpp + + build: $(objects) + ifeq ($(platform),x) +- $(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink) ++ $(CXX) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink) + else ifeq ($(platform),win) + windres phoenix/windows/phoenix.rc obj/phoenix-resource.o +- $(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink) +- $(cpp) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix ++ $(CXX) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink) ++ $(CXX) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix + endif + + resource: force |