aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorStefan Walter <stefan@FreeBSD.org>2010-05-18 21:44:36 +0000
committerStefan Walter <stefan@FreeBSD.org>2010-05-18 21:44:36 +0000
commit5b6eeb6f51cf4ef676e0c4e3650523302dc64e97 (patch)
tree5ae1d70da2751c0e73609bc51c3ad4f5ebcc6807 /emulators
parent0c481dd448d419708a2cf61f5f845522ad5e474a (diff)
downloadports-5b6eeb6f51cf4ef676e0c4e3650523302dc64e97.tar.gz
ports-5b6eeb6f51cf4ef676e0c4e3650523302dc64e97.zip
Notes
Diffstat (limited to 'emulators')
-rw-r--r--emulators/hatari/files/patch-Makefile.cnf.in22
-rw-r--r--emulators/hatari/files/patch-tools_hmsa_Makefile13
2 files changed, 35 insertions, 0 deletions
diff --git a/emulators/hatari/files/patch-Makefile.cnf.in b/emulators/hatari/files/patch-Makefile.cnf.in
new file mode 100644
index 000000000000..509502586a18
--- /dev/null
+++ b/emulators/hatari/files/patch-Makefile.cnf.in
@@ -0,0 +1,22 @@
+# This patch prevents shadowing of hatari's header
+# files by files in directories mentioned in X_CFLAGS.
+--- Makefile.cnf.in Sun Nov 22 01:43:31 2009 +0100
++++ Makefile.cnf.in Sun Nov 22 01:58:24 2009 +0100
+@@ -5,7 +5,7 @@
+ CC = @CC@
+
+ # Set flags passed to the compiler (e.g. optimization flags)
+-CFLAGS = @CFLAGS@ @X_CFLAGS@
++CFLAGS = @CFLAGS@
+
+ # Set flags passed to the preprocessor (e.g. -I<include dir>)
+ CPPFLAGS = @CPPFLAGS@
+@@ -30,7 +30,7 @@
+
+
+ # SDL-Library configuration (compiler flags and linker options)
+-SDL_CFLAGS = @SDL_CFLAGS@
++SDL_CFLAGS = @X_CFLAGS@ @SDL_CFLAGS@
+ SDL_LIBS = @SDL_LIBS@
+
+
diff --git a/emulators/hatari/files/patch-tools_hmsa_Makefile b/emulators/hatari/files/patch-tools_hmsa_Makefile
new file mode 100644
index 000000000000..f26982f5369a
--- /dev/null
+++ b/emulators/hatari/files/patch-tools_hmsa_Makefile
@@ -0,0 +1,13 @@
+# This patch prevents shadowing of hatari's header
+# files by files in directories mentioned in X_CFLAGS.
+--- tools/hmsa/Makefile Sun Nov 22 01:43:31 2009 +0100
++++ tools/hmsa/Makefile Sun Nov 22 01:59:13 2009 +0100
+@@ -8,7 +8,7 @@
+ OBJS = $(HMSA_OBJS) $(HATARI_OBJS:%.o=../../src/%.o)
+
+ # Additional include directories:
+-CPPFLAGS += $(SDL_CFLAGS) -I../.. -I../../src/includes -I../../src/uae-cpu
++CPPFLAGS += -I../.. -I../../src/includes -I../../src/uae-cpu $(SDL_CFLAGS)
+
+ all: hmsa
+