summaryrefslogtreecommitdiff
path: root/games-emulation/fbzx/files
diff options
context:
space:
mode:
Diffstat (limited to 'games-emulation/fbzx/files')
-rw-r--r--games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
index 0e1f02337146..f9751d7486dd 100644
--- a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
+++ b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
---- fbzx-3.0.0.orig/src/Makefile 2015-04-01 17:22:47.000000000 -0400
-+++ fbzx-3.0.0/src/Makefile 2016-04-01 13:15:27.230190807 -0400
+--- a/src/Makefile
++++ b/src/Makefile
@@ -1,78 +1,74 @@
-CC=g++ -c -O2
-CPP=g++ -c -O2
@@ -8,7 +7,7 @@ diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
-
CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
-CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
-+CXXFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
++CXXFLAGS += `${PKG_CONFIG} --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa`
@@ -104,9 +103,8 @@ diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
- $(CPP) $(CPPFLAGS) -o tape.o tape.cpp
+ $(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp
-diff -ru fbzx-3.0.0.orig/src/menus.cpp fbzx-3.0.0/src/menus.cpp
---- fbzx-3.0.0.orig/src/menus.cpp 2015-04-01 17:22:47.000000000 -0400
-+++ fbzx-3.0.0/src/menus.cpp 2016-04-01 13:15:33.213974823 -0400
+--- a/src/menus.cpp
++++ b/src/menus.cpp
@@ -1691,7 +1691,7 @@
void keyboard_menu() {