145 lines
3.5 KiB
Text
145 lines
3.5 KiB
Text
$NetBSD: patch-aa,v 1.10 2003/09/21 18:22:15 kristerw Exp $
|
|
--- Makefile.orig Tue Sep 18 08:03:58 2001
|
|
+++ Makefile Sun Sep 21 19:48:50 2003
|
|
@@ -1,14 +1,14 @@
|
|
-ZSNESFX=1
|
|
-ZSNESC4=1
|
|
-ASMCPU=1
|
|
+#ZSNESFX=1
|
|
+#ZSNESC4=1
|
|
+#ASMCPU=1
|
|
#SPC700ASM=1
|
|
NETPLAY=1
|
|
UNZIP=1
|
|
#GLIDE=1
|
|
#OPENGL=1
|
|
#GUI=1
|
|
-THREAD_SOUND=1
|
|
-ASMKREED=1
|
|
+#THREAD_SOUND=1
|
|
+#ASMKREED=1
|
|
|
|
ifdef ZSNESFX
|
|
FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o
|
|
@@ -34,13 +34,20 @@
|
|
C4NO_DEPENDS=zsnes_c4
|
|
endif
|
|
|
|
+ifdef NETBSD_USE_DGA
|
|
LINUXDEFINES=-DUSE_DGA_EXTENSION -DUSE_VIDMODE_EXTENSION
|
|
+DGALIBS=-lXxf86dga -lXxf86vm
|
|
+endif
|
|
|
|
ifdef SPC700ASM
|
|
SOUNDOBJ=spctool/spc700.o spctool/dsp.o spctool.o spctool/soundmod.o spc.o
|
|
SOUNDDEFINES=-DSPCTOOL
|
|
else
|
|
+ifdef USING_I386
|
|
SOUNDOBJ=spc700.o soundux.o apu.o i386/spc.o
|
|
+else
|
|
+SOUNDOBJ=spc700.o soundux.o apu.o
|
|
+endif
|
|
SOUNDDEFINES=-DSPC700_C
|
|
endif
|
|
|
|
@@ -58,6 +65,20 @@
|
|
KREEDOBJ=2xsai.o
|
|
endif
|
|
|
|
+ifdef USBJOY
|
|
+ifdef USBHID_H
|
|
+USBJOYDEFINES=-DJOYSTICK_SUPPORT -DHAVE_USBHID_H
|
|
+EXTRALIBS+=-lusbhid
|
|
+else
|
|
+USBJOYDEFINES=-DJOYSTICK_SUPPORT
|
|
+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 snaporig.o clip.o dsp1.o \
|
|
@@ -81,9 +102,10 @@
|
|
UNZIPDEFINES=-DUNZIP_SUPPORT
|
|
endif
|
|
|
|
+EXTRALIBS += -lossaudio
|
|
ifdef THREAD_SOUND
|
|
-CPUDEFINES += -DUSE_THREADS
|
|
-EXTRALIBS += -lpthread
|
|
+CPUDEFINES += -DUSE_THREADS -I${BUILDLINK_DIR}/include
|
|
+EXTRALIBS += -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -lpthread
|
|
endif
|
|
|
|
ifdef GLIDE
|
|
@@ -113,9 +135,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 -pipe
|
|
+else
|
|
+OPTIMISE=-fno-exceptions -Wall -W -fomit-frame-pointer
|
|
+endif
|
|
|
|
#OPTIMISE=-g -fno-exceptions
|
|
#-DMITSHM
|
|
@@ -124,10 +150,8 @@
|
|
-Ii386 \
|
|
-I. \
|
|
-Iunzip \
|
|
--DJOYSTICK_SUPPORT \
|
|
-DZLIB \
|
|
-DVAR_CYCLES \
|
|
--DDEBUGGER \
|
|
-DCPU_SHUTDOWN \
|
|
-DSPC700_SHUTDOWN \
|
|
-DOLD_COLOUR_BLENDING \
|
|
@@ -142,7 +166,8 @@
|
|
$(OPENGLDEFINES) \
|
|
$(GUIDEFINES) \
|
|
$(KREEDDEFINES) \
|
|
--DNO_INLINE_SET_GET
|
|
+$(USBJOYDEFINES) \
|
|
+$(EXTRADEFINES)
|
|
|
|
#-DSOUND
|
|
#-DDEBUGGER
|
|
@@ -154,9 +179,9 @@
|
|
CFLAGS=$(CCFLAGS)
|
|
|
|
.SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj
|
|
-LDLIBS = -L/usr/X11R6/lib
|
|
+LDLIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
|
|
|
|
-all: offsets snes9x ssnes9x
|
|
+all: offsets snes9x
|
|
|
|
#ggisnes9x
|
|
#xf86snes9x
|
|
@@ -182,7 +207,7 @@
|
|
./offsets >i386/offsets.h
|
|
|
|
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
|
|
@@ -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) $(EXTRADEFINES) -i. -ii386 -o $@ $*.asm
|
|
|
|
.obj.o:
|
|
cp $*.obj $*.o
|