83 lines
2 KiB
Text
83 lines
2 KiB
Text
--- Makefile.orig Wed Feb 28 15:29:58 2001
|
|
+++ Makefile Sat Mar 24 23:16:22 2001
|
|
@@ -4,7 +4,6 @@
|
|
#SPC700ASM=1
|
|
NETPLAY=1
|
|
UNZIP=1
|
|
-GLIDE=1
|
|
#GUI=1
|
|
THREAD_SOUND=1
|
|
ASMKREED=1
|
|
@@ -81,11 +80,6 @@
|
|
UNZIPDEFINES=-DUNZIP_SUPPORT
|
|
endif
|
|
|
|
-ifdef THREAD_SOUND
|
|
-CPUDEFINES += -DUSE_THREADS
|
|
-EXTRALIBS += -lpthread
|
|
-endif
|
|
-
|
|
ifdef GLIDE
|
|
GLIDEOBJS = unix/glide.o
|
|
GLIDEDEFINES = -DUSE_GLIDE -I/usr/include/glide
|
|
@@ -98,13 +92,13 @@
|
|
endif
|
|
|
|
MOC = $(QTDIR)/bin/moc
|
|
-CCC = g++ -fno-rtti
|
|
+CCC = $(CXX) -fno-rtti
|
|
CC = gcc
|
|
NASM = nasm
|
|
|
|
-INCLUDES=-I/usr/X11R6/include -I/usr/local/include
|
|
+INCLUDES=-I$(X11BASE)/include -I$(LOCALBASE)/include
|
|
|
|
-OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe
|
|
+OPTIMISE= $(CFLAGS) -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe
|
|
|
|
#OPTIMISE=-g -fno-exceptions
|
|
#-DMITSHM
|
|
@@ -119,6 +113,7 @@
|
|
-DDEBUGGER \
|
|
-DCPU_SHUTDOWN \
|
|
-DSPC700_SHUTDOWN \
|
|
+-DSOUND \
|
|
$(LINUXDEFINES) \
|
|
$(FXDEFINES) \
|
|
$(C4DEFINES) \
|
|
@@ -131,6 +126,11 @@
|
|
$(KREEDDEFINES)
|
|
#-DNO_INLINE_SET_GET
|
|
|
|
+ifdef USB_JOYSTICK_SUPPORT
|
|
+CCFLAGS += -DJOYSTICK_SUPPORT
|
|
+EXTRALIBS += -lusb
|
|
+endif
|
|
+
|
|
#-DSOUND
|
|
#-DDEBUGGER
|
|
#-DNO_INLINE_SET_GET
|
|
@@ -138,12 +138,10 @@
|
|
#-DCPU_SHUTDOWN
|
|
#-DSPC700_SHUTDOWN
|
|
|
|
-CFLAGS=$(CCFLAGS)
|
|
-
|
|
.SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj
|
|
-LDLIBS = -L/usr/X11R6/lib frame.o
|
|
+LDLIBS = -L$(X11BASE)/lib
|
|
|
|
-all: offsets snes9x ssnes9x
|
|
+all: offsets snes9x
|
|
|
|
#ggisnes9x
|
|
#xf86snes9x
|
|
@@ -165,7 +163,7 @@
|
|
./offsets >i386/offsets.h
|
|
|
|
snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(GUIOBJS)
|
|
- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(GUILIBS) -lXxf86dga -lXxf86vm -lXext -lX11 $(EXTRALIBS) -lz -lm
|
|
+ $(CCC) $(INCLUDES) $(OPTIMISE) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(GUILIBS) -lXxf86dga -lXxf86vm -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
|