diff options
Diffstat (limited to 'emulators/snes9x/patches/patch-aa')
| -rw-r--r-- | emulators/snes9x/patches/patch-aa | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/emulators/snes9x/patches/patch-aa b/emulators/snes9x/patches/patch-aa index 2f573338f8d..711c20d7119 100644 --- a/emulators/snes9x/patches/patch-aa +++ b/emulators/snes9x/patches/patch-aa @@ -1,8 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2002/02/19 05:30:39 jmc Exp $ - ---- Makefile.orig Wed Feb 28 20:29:58 2001 -+++ Makefile Tue Feb 19 05:18:10 2002 -@@ -1,13 +1,13 @@ +$NetBSD: patch-aa,v 1.6 2002/07/08 01:04:09 kristerw Exp $ +--- Makefile.orig Tue Sep 18 08:03:58 2001 ++++ Makefile Mon Jul 8 02:32:48 2002 +@@ -1,14 +1,14 @@ -ZSNESFX=1 -ZSNESC4=1 -ASMCPU=1 @@ -12,8 +11,8 @@ $NetBSD: patch-aa,v 1.5 2002/02/19 05:30:39 jmc Exp $ #SPC700ASM=1 NETPLAY=1 UNZIP=1 --GLIDE=1 -+#GLIDE=1 + #GLIDE=1 + #OPENGL=1 #GUI=1 -THREAD_SOUND=1 -ASMKREED=1 @@ -22,7 +21,7 @@ $NetBSD: patch-aa,v 1.5 2002/02/19 05:30:39 jmc Exp $ ifdef ZSNESFX FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o -@@ -33,13 +33,19 @@ +@@ -34,7 +34,10 @@ C4NO_DEPENDS=zsnes_c4 endif @@ -33,19 +32,11 @@ $NetBSD: patch-aa,v 1.5 2002/02/19 05:30:39 jmc Exp $ ifdef SPC700ASM SOUNDOBJ=spctool/spc700.o spctool/dsp.o spctool.o spctool/soundmod.o spc.o - SOUNDDEFINES=-DSPCTOOL - else --SOUNDOBJ=spc700.o soundux.o apu.o i386/spc.o -+SOUNDOBJ=spc700.o soundux.o apu.o -+ifdef USING_I386 -+SOUNDOBJ+=i386/spc.o -+endif - SOUNDDEFINES=-DSPC700_C - endif - -@@ -82,8 +88,8 @@ +@@ -81,9 +84,10 @@ + UNZIPDEFINES=-DUNZIP_SUPPORT endif ++EXTRALIBS += -lossaudio ifdef THREAD_SOUND -CPUDEFINES += -DUSE_THREADS -EXTRALIBS += -lpthread @@ -54,35 +45,45 @@ $NetBSD: patch-aa,v 1.5 2002/02/19 05:30:39 jmc Exp $ endif ifdef GLIDE -@@ -102,9 +108,13 @@ +@@ -113,9 +117,13 @@ CC = gcc NASM = nasm -INCLUDES=-I/usr/X11R6/include -I/usr/local/include +INCLUDES=-I${X11BASE}/include --OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe +ifdef USING_I386 -+OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe + OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe +else -+OPTIMISE=-fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer ++OPTIMISE=-fno-exceptions -Wall -W -pedantic -fomit-frame-pointer +endif #OPTIMISE=-g -fno-exceptions #-DMITSHM -@@ -113,7 +123,6 @@ +@@ -124,10 +132,8 @@ -Ii386 \ -I. \ -Iunzip \ --DJOYSTICK_SUPPORT \ -DZLIB \ -DVAR_CYCLES \ - -DDEBUGGER \ -@@ -141,9 +150,9 @@ +--DDEBUGGER \ + -DCPU_SHUTDOWN \ + -DSPC700_SHUTDOWN \ + -DOLD_COLOUR_BLENDING \ +@@ -142,7 +148,6 @@ + $(OPENGLDEFINES) \ + $(GUIDEFINES) \ + $(KREEDDEFINES) \ +--DNO_INLINE_SET_GET + + #-DSOUND + #-DDEBUGGER +@@ -154,9 +159,9 @@ CFLAGS=$(CCFLAGS) .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj --LDLIBS = -L/usr/X11R6/lib frame.o +-LDLIBS = -L/usr/X11R6/lib +LDLIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -all: offsets snes9x ssnes9x @@ -90,21 +91,21 @@ $NetBSD: patch-aa,v 1.5 2002/02/19 05:30:39 jmc Exp $ #ggisnes9x #xf86snes9x -@@ -165,7 +174,7 @@ +@@ -182,7 +187,7 @@ ./offsets >i386/offsets.h - snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(GUIOBJS) -- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(GUILIBS) -lXxf86dga -lXxf86vm -lXext -lX11 $(EXTRALIBS) -lz -lm -+ $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(GUILIBS) $(DGALIBS) -lXext -lX11 $(EXTRALIBS) -lz -lm + snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(OPENGLOBJS) $(GUIOBJS) $(KREEDOBJ) +- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) $(OPENGLOBJS) $(KREEDOBJ) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) -lXxf86dga -lXxf86vm -lXext -lX11 $(EXTRALIBS) -lz -lm ++ $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) $(OPENGLOBJS) $(KREEDOBJ) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) $(DGALIBS) -lXext -lX11 $(EXTRALIBS) -lz -lm ssnes9x: $(OBJECTS) unix/svga.o $(GLIDEOBJS) $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm -@@ -195,7 +204,7 @@ +@@ -212,7 +217,7 @@ $(CCC) $(INCLUDES) -c -E $(CCFLAGS) $*.S -o $@ .asm.o: -- $(NASM) -f elf -i. -ii386 -o $@ $*.asm -+ $(NASM) -f ${FILEFORMAT} -i. -ii386 -o $@ $*.asm +- $(NASM) -f elf $(FXDEFINES) -i. -ii386 -o $@ $*.asm ++ $(NASM) -f ${FILEFORMAT} $(FXDEFINES) -i. -ii386 -o $@ $*.asm .obj.o: cp $*.obj $*.o |