summaryrefslogtreecommitdiff
path: root/emulators/mame/files/sdl.mak.patch
diff options
context:
space:
mode:
authorChris Rees <crees@FreeBSD.org>2011-08-13 17:04:38 +0000
committerChris Rees <crees@FreeBSD.org>2011-08-13 17:04:38 +0000
commitbc8dd1b9310ccd2b20d13ef6452955aeb341877e (patch)
tree5ad3206511a8437c780e7ab1fbb84a2a7588a0d1 /emulators/mame/files/sdl.mak.patch
parent- Update to 0.43a (diff)
- Update to 0.143p2 ('borrowing' obrien's cool patchlevel code from editors/vim)
- Add missing fontconfig dependency - Use PORTDOCS/PORTEXAMPLES - Use PATCHDIR (not FILESDIR) - Use COPYTREE_SHARE (not cp -R) Mostly based on: PR: ports/153645 Submitted by: Emmanuel Vadot <elbarto@arcadebsd.org> (maintainer), acm Approved by: maintainer timeout (8 weeks)
Notes
Notes: svn path=/head/; revision=279613
Diffstat (limited to 'emulators/mame/files/sdl.mak.patch')
-rw-r--r--emulators/mame/files/sdl.mak.patch24
1 files changed, 15 insertions, 9 deletions
diff --git a/emulators/mame/files/sdl.mak.patch b/emulators/mame/files/sdl.mak.patch
index 4ebbccccf877..7de85e19b832 100644
--- a/emulators/mame/files/sdl.mak.patch
+++ b/emulators/mame/files/sdl.mak.patch
@@ -1,15 +1,19 @@
---- src/osd/sdl/sdl.mak.orig 2010-02-14 04:47:30.000000000 +0100
-+++ src/osd/sdl/sdl.mak 2010-07-30 12:05:33.000000000 +0200
+$FreeBSD$
+
+This is applied if WITH_DEBUG is unset.
+
+--- src/osd/sdl/sdl.mak 2011-06-21 19:58:18.000000000 -0500
++++ src/osd/sdl/sdl.mak 2011-06-21 20:01:07.000000000 -0500
@@ -139,7 +139,7 @@
ifeq ($(TARGETOS),freebsd)
BASE_TARGETOS = unix
SYNC_IMPLEMENTATION = tc
-DEFS += -DNO_AFFINITY_NP
+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
+ LIBS += -lutil
# /usr/local/include is not considered a system include directory
# on FreeBSD. GL.h resides there and throws warnings
- CCOMFLAGS += -isystem /usr/local/include
-@@ -205,7 +205,7 @@
+@@ -213,7 +213,7 @@
ifndef GTK_INSTALL_ROOT
NO_DEBUGGER = 1
else
@@ -17,8 +21,8 @@
+DEBUGOBJS = $(SDLOBJ)/debugwin.o
LIBS += -lgtk-win32-2.0 -lgdk-win32-2.0 -lgmodule-2.0 -lglib-2.0 -lgobject-2.0 \
-lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0
- CCOMFLAGS += -mms-bitfields \
-@@ -304,7 +304,7 @@
+ CCOMFLAGS += -mms-bitfields
+@@ -315,7 +315,7 @@
ifeq ($(BASE_TARGETOS),unix)
DEFS += -DSDLMAME_UNIX
@@ -27,13 +31,15 @@
LIBGL = -lGL
ifeq ($(NO_X11),1)
NO_DEBUGGER = 1
-@@ -454,8 +454,8 @@
+@@ -484,9 +484,9 @@
# the new debugger relies on GTK+ in addition to the base SDLMAME needs
# Non-X11 builds can not use the debugger
--CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
+-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
+-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
-+#CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
++#INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
++#CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED