emulators/snes9x/patches/patch-aa

   1 $NetBSD$
   2
   3 --- Makefile.in.orig    2004-12-30 14:15:44.000000000 -0800
   4 +++ Makefile.in
   5 @@ -113,6 +113,20 @@ SPC7110OBJ=spc7110.o
   6  OBC1OBJ=obc1.o
   7  SETAOBJ=seta.o seta010.o seta011.o seta018.o
   8
   9 +ifdef USBJOY
  10 +ifdef USBHID_H
  11 +USBJOYDEFINES=-DHAVE_USBHID_H
  12 +EXTRALIBS+=-lusbhid
  13 +else
  14 +USBJOYDEFINES=
  15 +EXTRALIBS+=-lusb
  16 +endif
  17 +endif
  18 +
  19 +ifdef _ASM_UNDERBARS
  20 +EXTRADEFINES+=-D_ASM_UNDERBARS
  21 +endif
  22 +
  23  OBJECTS=$(CPUOBJ) $(SOUNDOBJ) apudebug.o $(FXOBJ) $(C4OBJ) \
  24         cpu.o sa1.o debug.o sdd1.o tile.o srtc.o gfx.o memmap.o clip.o \
  25         dsp1.o ppu.o dma.o snes9x.o data.o globals.o \
  26 @@ -136,9 +150,10 @@ OBJECTS += jma/s9x-jma.o jma/7zlzma.o jm
  27  JMADEFINES=-DJMA_SUPPORT -fexceptions
  28  endif
  29
  30 +EXTRALIBS += ${LIBOSSAUDIO}
  31  ifdef THREAD_SOUND
  32 -CPUDEFINES += -DUSE_THREADS
  33 -EXTRALIBS += -lpthread
  34 +CPUDEFINES += -DUSE_THREADS -I${BUILDLINK_DIR}/include
  35 +EXTRALIBS += -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  36  endif
  37
  38  ifdef GLIDE
  39 @@ -186,7 +201,7 @@ ifdef DREAMCAST
  40  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
  41  CPUFLAGS=-ml  -m4-single-only
  42  else
  43 -OPTIMISE = @OPTIMIZE@
  44 +OPTIMISE=
  45  endif
  46
  47  DEFS += \
  48 @@ -206,6 +221,8 @@ $(AIDODEFINES) \
  49  $(KREEDDEFINES) \
  50  $(SDD1DEFINES) \
  51  $(JOYDEFINES) \
  52 +$(USBJOYDEFINES) \
  53 +$(EXTRADEFINES) \
  54  -DNO_INLINE_SET_GET @SYSDEFINES@
  55
  56  #-DOLD_COLOUR_BLENDING
  57 @@ -302,7 +319,7 @@ s9xserver: $(SERVER_OBJECTS)
  58         sh-elf-as -little $(srcdir)/$*.s -o $@
  59
  60  .asm.o:
  61 -       $(NASM) -f elf $(FXDEFINES) -I$(srcdir)/ -I$(srcdir)/$(CPU)/ -o $@ $(srcdir)/$*.asm
  62 +       $(NASM) -f ${FILEFORMAT} $(FXDEFINES) $(EXTRADEFINES) -I$(srcdir)/ -I$(srcdir)/$(CPU)/ -o $@ $(srcdir)/$*.asm
  63
  64  .obj.o:
  65         cp $*.obj $*.o