diff options
| author | jmc <jmc@pkgsrc.org> | 2002-02-19 05:30:39 +0000 |
|---|---|---|
| committer | jmc <jmc@pkgsrc.org> | 2002-02-19 05:30:39 +0000 |
| commit | 387bbfd45fc98362194989b89c8a533f71224f38 (patch) | |
| tree | e02b6a2560811c7d633d143f77c929c2425cb7be /emulators/snes9x | |
| parent | 4692e3038241c1e1e5506745409505ed79ba893d (diff) | |
| download | pkgsrc-387bbfd45fc98362194989b89c8a533f71224f38.tar.gz | |
Fix so if not building on x86 it never tries to pull x86 assembly into the code.
Diffstat (limited to 'emulators/snes9x')
| -rw-r--r-- | emulators/snes9x/distinfo | 4 | ||||
| -rw-r--r-- | emulators/snes9x/patches/patch-aa | 30 |
2 files changed, 22 insertions, 12 deletions
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo index 25e0f8ffa8d..92f1c9ad07f 100644 --- a/emulators/snes9x/distinfo +++ b/emulators/snes9x/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/07/17 15:31:24 wiz Exp $ +$NetBSD: distinfo,v 1.4 2002/02/19 05:30:39 jmc Exp $ SHA1 (s9xs137c.zip) = c0adc6ca41572a6dfd31ab98ea6c6c448777d56f Size (s9xs137c.zip) = 653410 bytes -SHA1 (patch-aa) = 19b4e22c31741f0726d527e18a1bbc7fbfd11546 +SHA1 (patch-aa) = 79122a382681b6b1282b5a03fc176ac33aa17c0e SHA1 (patch-ab) = b99893934074d8693a9609d49e49953ade2b2062 SHA1 (patch-ac) = 25a054c55774421f1ba133906de9134a0ba233f5 SHA1 (patch-ad) = 72cc9904c74e0668cce450fcada24453aec344e4 diff --git a/emulators/snes9x/patches/patch-aa b/emulators/snes9x/patches/patch-aa index fadef9a5db5..2f573338f8d 100644 --- a/emulators/snes9x/patches/patch-aa +++ b/emulators/snes9x/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2002/02/19 05:30:39 jmc Exp $ ---- Makefile.orig Wed Feb 28 21:29:58 2001 -+++ Makefile +--- Makefile.orig Wed Feb 28 20:29:58 2001 ++++ Makefile Tue Feb 19 05:18:10 2002 @@ -1,13 +1,13 @@ -ZSNESFX=1 -ZSNESC4=1 @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ ifdef ZSNESFX FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o -@@ -33,7 +33,10 @@ +@@ -33,13 +33,19 @@ C4NO_DEPENDS=zsnes_c4 endif @@ -33,7 +33,17 @@ $NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ ifdef SPC700ASM SOUNDOBJ=spctool/spc700.o spctool/dsp.o spctool.o spctool/soundmod.o spc.o -@@ -82,8 +85,8 @@ + 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 @@ endif ifdef THREAD_SOUND @@ -44,7 +54,7 @@ $NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ endif ifdef GLIDE -@@ -102,9 +105,13 @@ +@@ -102,9 +108,13 @@ CC = gcc NASM = nasm @@ -60,7 +70,7 @@ $NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ #OPTIMISE=-g -fno-exceptions #-DMITSHM -@@ -113,7 +120,6 @@ +@@ -113,7 +123,6 @@ -Ii386 \ -I. \ -Iunzip \ @@ -68,7 +78,7 @@ $NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ -DZLIB \ -DVAR_CYCLES \ -DDEBUGGER \ -@@ -141,9 +147,9 @@ +@@ -141,9 +150,9 @@ CFLAGS=$(CCFLAGS) .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj @@ -80,7 +90,7 @@ $NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ #ggisnes9x #xf86snes9x -@@ -165,7 +171,7 @@ +@@ -165,7 +174,7 @@ ./offsets >i386/offsets.h snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(GUIOBJS) @@ -89,7 +99,7 @@ $NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $ ssnes9x: $(OBJECTS) unix/svga.o $(GLIDEOBJS) $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm -@@ -195,7 +201,7 @@ +@@ -195,7 +204,7 @@ $(CCC) $(INCLUDES) -c -E $(CCFLAGS) $*.S -o $@ .asm.o: |