Make this compile for a.out too.

PKGREVISION++

8 files changed, 87 insertions, 18 deletions

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index e82cc065a57..103843fa221 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/12/28 17:18:01 kristerw Exp $
+# $NetBSD: Makefile,v 1.14 2002/12/30 21:40:10 kristerw Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
-PKGREVISION=		1
+PKGREVISION=		2
 WRKSRC=			${WRKDIR}/release
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.snes9x.com/zips/
@@ -41,7 +41,7 @@ MAKE_ENV+=	FILEFORMAT=aoutb
 MAKE_ENV+=	_ASM_UNDERBARS=1
 .else
 MAKE_ENV+=	FILEFORMAT=elf
-# use assembler part only for ELF, since it doesn't link on a.out
+.endif
 MAKE_ENV+=	ZSNESFX=1
 MAKE_ENV+=	ZSNESC4=1
 MAKE_ENV+=	ASMCPU=1
@@ -50,7 +50,6 @@ MAKE_ENV+=	ASMKREED=1
 .endif
 BUILD_DEFS+=	USE_MMX
 .endif
-.endif
 
 .if exists(${X11BASE}/lib/libXxf86dga.a)
 MAKE_ENV+=	NETBSD_USE_DGA=1
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index 07da0c75016..e8ce4d236dd 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/08/15 00:16:35 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2002/12/30 21:40:11 kristerw Exp $
 
 SHA1 (s9xs139.zip) = 15acf6d8a31dc51b26a42abf747cec1b72c2aa29
 Size (s9xs139.zip) = 666463 bytes
-SHA1 (patch-aa) = a881151e77638ec98c33fbdd79020c5a3fc7c3e9
+SHA1 (patch-aa) = 20c1d402e26c3e8f49f9d767f02fa3b67cca985c
 SHA1 (patch-ab) = b99893934074d8693a9609d49e49953ade2b2062
 SHA1 (patch-ac) = e54f4fff397dd4ca3be28711fd23c4fbef57ed54
 SHA1 (patch-ad) = 72cc9904c74e0668cce450fcada24453aec344e4
@@ -12,3 +12,8 @@ SHA1 (patch-ag) = 74c74739f4f0f22b76594ba379939df8cfc52188
 SHA1 (patch-ah) = 60bd35e51faca36fbd8d8d6354487554af17fe7a
 SHA1 (patch-ai) = 2f522a560577aff89af9efa7a6b129faa99670fd
 SHA1 (patch-aj) = 71f228195be1381f52b1fe875506abde54fd8396
+SHA1 (patch-ak) = 4154979877ac98976a6eaf364030b840e8715e30
+SHA1 (patch-al) = 7c703d57d7b0058d9ef7e598c7a03e18a9a234f8
+SHA1 (patch-am) = 0630f836f8f7d44ee5476a73de4f7934897814f2
+SHA1 (patch-an) = 2cbcd9376cdd98734a7dcd7eba63698946323474
+SHA1 (patch-ao) = 2cb334bed163ef1965fb42ab5f0fa9cd919af835
diff --git a/emulators/snes9x/patches/patch-aa b/emulators/snes9x/patches/patch-aa
index 70a57a1b214..9007069c5d6 100644
--- a/emulators/snes9x/patches/patch-aa
+++ b/emulators/snes9x/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
+$NetBSD: patch-aa,v 1.9 2002/12/30 21:40:11 kristerw Exp $
 --- Makefile.orig	Tue Sep 18 08:03:58 2001
-+++ Makefile	Thu Aug 15 02:00:53 2002
++++ Makefile	Mon Dec 30 21:14:12 2002
 @@ -1,14 +1,14 @@
 -ZSNESFX=1
 -ZSNESC4=1
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
  SOUNDDEFINES=-DSPC700_C
  endif
  
-@@ -58,6 +65,16 @@
+@@ -58,6 +65,20 @@
  KREEDOBJ=2xsai.o
  endif
  
@@ -56,10 +56,14 @@ $NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
 +endif
 +endif
 +
++ifdef _ASM_UNDERBARS
++EXTRADEFINES+=-D_ASM_UNDERBARS
++endif
++
  OBJECTS=$(CPUOBJ) $(SOUNDOBJ) apudebug.o $(FXOBJ) $(C4OBJ) \
  	cpu.o sa1.o debug.o sdd1.o tile.o srtc.o \
  	gfx.o memmap.o snaporig.o clip.o dsp1.o \
-@@ -81,9 +98,10 @@
+@@ -81,9 +102,10 @@
  UNZIPDEFINES=-DUNZIP_SUPPORT
  endif
  
@@ -72,7 +76,7 @@ $NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
  endif
  
  ifdef GLIDE
-@@ -113,9 +131,13 @@
+@@ -113,9 +135,13 @@
  CC = gcc
  NASM = nasm
  
@@ -87,7 +91,7 @@ $NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
  
  #OPTIMISE=-g -fno-exceptions
  #-DMITSHM 
-@@ -124,10 +146,8 @@
+@@ -124,10 +150,8 @@
  -Ii386 \
  -I. \
  -Iunzip \
@@ -98,16 +102,17 @@ $NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
  -DCPU_SHUTDOWN \
  -DSPC700_SHUTDOWN \
  -DOLD_COLOUR_BLENDING \
-@@ -142,7 +162,7 @@
+@@ -142,7 +166,8 @@
  $(OPENGLDEFINES) \
  $(GUIDEFINES) \
  $(KREEDDEFINES) \
 --DNO_INLINE_SET_GET
-+$(USBJOYDEFINES)
++$(USBJOYDEFINES) \
++$(EXTRADEFINES)
  
  #-DSOUND
  #-DDEBUGGER
-@@ -154,9 +174,9 @@
+@@ -154,9 +179,9 @@
  CFLAGS=$(CCFLAGS)
  
  .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj
@@ -119,7 +124,7 @@ $NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
  
  #ggisnes9x
  #xf86snes9x
-@@ -182,7 +202,7 @@
+@@ -182,7 +207,7 @@
  	./offsets >i386/offsets.h
  
  snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(OPENGLOBJS) $(GUIOBJS) $(KREEDOBJ)
@@ -128,12 +133,12 @@ $NetBSD: patch-aa,v 1.8 2002/08/15 00:16:36 kristerw Exp $
  
  ssnes9x: $(OBJECTS) unix/svga.o $(GLIDEOBJS) 
  	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm
-@@ -212,7 +232,7 @@
+@@ -212,7 +237,7 @@
  	$(CCC) $(INCLUDES) -c -E $(CCFLAGS) $*.S -o $@
  
  .asm.o:
 -	$(NASM) -f elf $(FXDEFINES) -i. -ii386 -o $@ $*.asm
-+	$(NASM) -f ${FILEFORMAT} $(FXDEFINES) -i. -ii386 -o $@ $*.asm
++	$(NASM) -f ${FILEFORMAT} $(FXDEFINES) $(EXTRADEFINES) -i. -ii386 -o $@ $*.asm
  
  .obj.o:
  	cp $*.obj $*.o
diff --git a/emulators/snes9x/patches/patch-ak b/emulators/snes9x/patches/patch-ak
new file mode 100644
index 00000000000..3f0799a1d70
--- /dev/null
+++ b/emulators/snes9x/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2002/12/30 21:40:12 kristerw Exp $
+--- i386/zsnesc4.asm.orig	Mon Dec 30 21:21:54 2002
++++ i386/zsnesc4.asm	Mon Dec 30 21:22:42 2002
+@@ -51,7 +51,7 @@
+ 
+ SECTION .data
+ 
+-%ifdef __DJGPP__
++%ifdef _ASM_UNDERBARS
+ %define ROM _ROM
+ %define RegRAM _RegRAM
+ %define S9xInitC4 _S9xInitC4
diff --git a/emulators/snes9x/patches/patch-al b/emulators/snes9x/patches/patch-al
new file mode 100644
index 00000000000..32078bf91cb
--- /dev/null
+++ b/emulators/snes9x/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2002/12/30 21:40:12 kristerw Exp $
+--- i386/zsnes.asm.orig	Mon Dec 30 21:21:47 2002
++++ i386/zsnes.asm	Mon Dec 30 21:22:23 2002
+@@ -92,7 +92,7 @@
+ 
+ SECTION .data
+ 
+-%ifdef __DJGPP__
++%ifdef _ASM_UNDERBARS
+ %define SRAM _SRAM
+ %define ROM _ROM
+ %define RegRAM _RegRAM
diff --git a/emulators/snes9x/patches/patch-am b/emulators/snes9x/patches/patch-am
new file mode 100644
index 00000000000..7ae7402f488
--- /dev/null
+++ b/emulators/snes9x/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2002/12/30 21:40:12 kristerw Exp $
+--- i386/spc.asm.orig	Mon Dec 30 21:53:48 2002
++++ i386/spc.asm	Mon Dec 30 21:54:09 2002
+@@ -18,7 +18,7 @@
+ ;Destroys:
+ ;   EAX
+ 
+-%ifdef __DJGPP__
++%ifdef _ASM_UNDERBARS
+ %define DecodeBlockAsm _DecodeBlockAsm
+ %define DecodeBlockAsm2 _DecodeBlockAsm2
+ %endif
diff --git a/emulators/snes9x/patches/patch-an b/emulators/snes9x/patches/patch-an
new file mode 100644
index 00000000000..cfc5066e099
--- /dev/null
+++ b/emulators/snes9x/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2002/12/30 21:40:12 kristerw Exp $
+--- i386/c4.asm.orig	Mon Dec 30 22:31:27 2002
++++ i386/c4.asm	Mon Dec 30 22:31:55 2002
+@@ -5,7 +5,7 @@
+ ; enter : BL = bank number, CX = address location
+ ; leave : AL = value read
+ 
+-%ifdef __DJGPP__
++%ifdef _ASM_UNDERBARS
+ %define C4WFXVal _C4WFXVal
+ %define C4WFYVal _C4WFYVal
+ %define C4WFX2Val _C4WFX2Val
diff --git a/emulators/snes9x/patches/patch-ao b/emulators/snes9x/patches/patch-ao
new file mode 100644
index 00000000000..72c88d96537
--- /dev/null
+++ b/emulators/snes9x/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2002/12/30 21:40:12 kristerw Exp $
+--- i386/sa1struc.h.orig	Mon Dec 30 22:30:11 2002
++++ i386/sa1struc.h	Mon Dec 30 22:30:50 2002
+@@ -38,7 +38,7 @@
+  * Super NES and Super Nintendo Entertainment System are trademarks of
+  * Nintendo Co., Limited and its subsidiary companies.
+  */
+-#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS)
++#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS) || defined(_ASM_UNDERBARS)
+ #define S9xTraceMessage _S9xTraceMessage
+ #define S9xGetPPU _S9xGetPPU
+ #define S9xSetPPU _S9xSetPPU