summaryrefslogtreecommitdiff
path: root/emulators/fmsx/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/fmsx/patches/patch-aa')
-rw-r--r--emulators/fmsx/patches/patch-aa26
1 files changed, 15 insertions, 11 deletions
diff --git a/emulators/fmsx/patches/patch-aa b/emulators/fmsx/patches/patch-aa
index 6bd78f7f266..7f4acf63670 100644
--- a/emulators/fmsx/patches/patch-aa
+++ b/emulators/fmsx/patches/patch-aa
@@ -1,26 +1,30 @@
-$NetBSD: patch-aa,v 1.2 2000/08/06 14:45:05 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2001/06/03 17:34:57 kei Exp $
---- Makefile.orig Thu Aug 3 19:23:33 2000
-+++ Makefile Sun Aug 6 15:27:17 2000
-@@ -44,10 +44,8 @@
+--- Makefile.orig Mon May 14 07:38:23 2001
++++ Makefile Sun Jun 3 04:48:12 2001
+@@ -42,10 +42,8 @@
+ # If you are getting linker errors about not found X11 functions,
# change the -L/usr/X11R6/lib to the directory where X11
# libraries libX11.* and libXext.* are located on your system.
- CC = gcc
+-CC = gcc
-DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM \
- -DDISK -DNARROW -DSOUND -DBPP16
--CFLAGS = -O3 -fomit-frame-pointer \
-- -I/usr/X11/include -L/usr/X11/lib ${DEFINES}
+-CFLAGS = -O3 -I/usr/X11R6/include -L/usr/X11R6/lib ${DEFINES}
+DEFINES = -DFMSX -DUNIX -DDISK -DNARROW ${DEFS}
-+CFLAGS = -O3 -fomit-frame-pointer -I${X11BASE}/include ${DEFINES}
- OBJECTS = fMSX.o MSX.o Z80.o AY8910.o SCC.o V9938.o Patch.o Debug.o \
- Disk.o Unix.o LibUnix.o SndUnix.o MIDI.o
++CFLAGS = -O3 -Wall -fomit-frame-pointer -I${X11BASE}/include ${DEFINES}
+ OBJECTS = fMSX.o MSX.o Z80.o AY8910.o YM2413.o SCC.o I8251.o V9938.o \
+ Patch.o Debug.o Disk.o Unix.o LibUnix.o SndUnix.o Sound.o
-@@ -63,7 +61,7 @@
+@@ -61,7 +59,11 @@
# fMSX Unix/X requires X11 libraries. See note above if you are
# experiencing any problems.
fmsx: ${OBJECTS}
- ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -lXext -lX11
++.if defined(USE_SUN_AUDIO)
+ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11
++.else
++ ${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lossaudio -lXext -lX11
++.endif
# Clean up.
clean: