$NetBSD: patch-aa,v 1.13 2006/04/16 01:21:08 ben Exp $

--- Makefile.in.orig	2004-12-30 14:15:44.000000000 -0800
+++ Makefile.in
@@ -113,6 +113,20 @@ SPC7110OBJ=spc7110.o
 OBC1OBJ=obc1.o
 SETAOBJ=seta.o seta010.o seta011.o seta018.o
 
+ifdef USBJOY
+ifdef USBHID_H
+USBJOYDEFINES=-DHAVE_USBHID_H
+EXTRALIBS+=-lusbhid
+else
+USBJOYDEFINES=
+EXTRALIBS+=-lusb
+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 clip.o \
 	dsp1.o ppu.o dma.o snes9x.o data.o globals.o \
@@ -136,9 +150,10 @@ OBJECTS += jma/s9x-jma.o jma/7zlzma.o jm
 JMADEFINES=-DJMA_SUPPORT -fexceptions
 endif
 
+EXTRALIBS += ${LIBOSSAUDIO}
 ifdef THREAD_SOUND
-CPUDEFINES += -DUSE_THREADS
-EXTRALIBS += -lpthread
+CPUDEFINES += -DUSE_THREADS -I${BUILDLINK_DIR}/include
+EXTRALIBS += -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 endif
 
 ifdef GLIDE
@@ -186,7 +201,7 @@ ifdef DREAMCAST
 OPTIMISE=-O4 -ffreestanding -ffast-math -fschedule-insns2 -fomit-frame-pointer -fno-inline-functions -fno-defer-pop -fforce-addr -fstrict-aliasing -funroll-loops -fdelete-null-pointer-checks -fno-exceptions
 CPUFLAGS=-ml  -m4-single-only
 else
-OPTIMISE = @OPTIMIZE@
+OPTIMISE=
 endif
 
 DEFS += \
@@ -206,6 +221,8 @@ $(AIDODEFINES) \
 $(KREEDDEFINES) \
 $(SDD1DEFINES) \
 $(JOYDEFINES) \
+$(USBJOYDEFINES) \
+$(EXTRADEFINES) \
 -DNO_INLINE_SET_GET @SYSDEFINES@
 
 #-DOLD_COLOUR_BLENDING
@@ -302,7 +319,7 @@ s9xserver: $(SERVER_OBJECTS)
 	sh-elf-as -little $(srcdir)/$*.s -o $@
 
 .asm.o:
-	$(NASM) -f elf $(FXDEFINES) -I$(srcdir)/ -I$(srcdir)/$(CPU)/ -o $@ $(srcdir)/$*.asm
+	$(NASM) -f ${FILEFORMAT} $(FXDEFINES) $(EXTRADEFINES) -I$(srcdir)/ -I$(srcdir)/$(CPU)/ -o $@ $(srcdir)/$*.asm
 
 .obj.o:
 	cp $*.obj $*.o