aboutsummaryrefslogtreecommitdiff
path: root/emulators/xmame/files
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2001-11-22 12:42:16 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2001-11-22 12:42:16 +0000
commit7a1c1cc62242ec74c0a94287686a04266482de58 (patch)
treecbcb57f35beeef9b1f5843907ddfff14df81ee9a /emulators/xmame/files
parent7bf34f2fb0e2af844c2a8598891be42bfcbdd97a (diff)
Notes
Diffstat (limited to 'emulators/xmame/files')
-rw-r--r--emulators/xmame/files/patch-ac21
-rw-r--r--emulators/xmame/files/patch-ad13
2 files changed, 25 insertions, 9 deletions
diff --git a/emulators/xmame/files/patch-ac b/emulators/xmame/files/patch-ac
index 47ee03e48f7f..f93a6f1b2eed 100644
--- a/emulators/xmame/files/patch-ac
+++ b/emulators/xmame/files/patch-ac
@@ -1,21 +1,24 @@
---- src/unix/unix.mak.orig Mon Apr 9 03:54:42 2001
-+++ src/unix/unix.mak Tue Apr 10 10:52:06 2001
-@@ -46,18 +46,18 @@
+--- src/unix/unix.mak.orig Thu Nov 15 07:15:47 2001
++++ src/unix/unix.mak Thu Nov 22 11:11:35 2001
+@@ -45,20 +45,20 @@
+
+ # svga and ggi also use $(X11LIB) since that's where zlib often is
LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext
- LIBS.svgalib = $(X11LIB) -lvga -lvgagl
+-LIBS.svgalib = $(X11LIB) -lvga -lvgagl
++LIBS.svgalib = -L$(LOCALBASE)/lib -lvga -lvgagl
LIBS.ggi = $(X11LIB) -lggi
-LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg
-+LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L/usr/local/lib -ljpeg
++LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L$(LOCALBASE)/lib -ljpeg
LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
LIBS.openstep = -framework AppKit
--LIBS.SDL = -ldl -lSDL -lpthread -D_REENTRANT
+-LIBS.SDL = `sdl-config --libs`
+LIBS.SDL = `$(SDL_CONFIG) --libs`
LIBS.photon2 = -L/usr/lib -lph -lphrender
CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS)
-CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS)
-+CFLAGS.xgl = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I/usr/local/include $(PTHREAD_CFLAGS)
++CFLAGS.xgl = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I$(LOCALBASE)/include $(PTHREAD_CFLAGS)
CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
CFLAGS.svgafx = -I/usr/include/glide
-CFLAGS.SDL = -D_REENTRANT
@@ -23,7 +26,7 @@
CFLAGS.photon2 =
INST.x11 = doinstall
-@@ -322,7 +322,7 @@
+@@ -340,7 +340,7 @@
doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \
@@ -32,7 +35,7 @@
cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
doc/gamelist.$(TARGET): all
-@@ -331,7 +331,8 @@
+@@ -349,7 +349,8 @@
doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
cat src/unix/xmame.6-1 > doc/x$(TARGET).6
diff --git a/emulators/xmame/files/patch-ad b/emulators/xmame/files/patch-ad
new file mode 100644
index 000000000000..b0462f7c8942
--- /dev/null
+++ b/emulators/xmame/files/patch-ad
@@ -0,0 +1,13 @@
+--- src/unix/video-drivers/svgainput.c.orig Tue Oct 16 11:06:30 2001
++++ src/unix/video-drivers/svgainput.c Tue Oct 16 11:05:37 2001
+@@ -12,6 +12,10 @@
+ #include "devices.h"
+ #include "keyboard.h"
+
++#ifdef __FreeBSD__
++#define SIGUNUSED SIGUSR2
++#endif
++
+ static int console_fd = -1;
+ static int mouse_fd = -1;
+ static int leds = 0;