Major rewrite/added BUTCH functionality

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index 0bc48d47b32f1e9b241550e9a7796300ec983b51..7d8d132b65b81776ddb80d7904fc77f05b1cec59 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ TARGET     = vj$(EXESUFFIX)
 
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
 CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
-               -fomit-frame-pointer `sdl-config --cflags`
+               -ffast-math -fomit-frame-pointer `sdl-config --cflags`
 #              -fomit-frame-pointer `sdl-config --cflags` -g
 #              -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
 
@@ -27,9 +27,8 @@ THECC = $(CC) $(CFLAGS) $(INCS)
 OBJS = \
        obj/anajoy.o \
        obj/blitter.o \
-       obj/cdbios.o \
-       obj/cdi.o \
        obj/cdrom.o \
+       obj/cdintf.o \
        obj/clock.o \
        obj/crc32.o \
        obj/dac.o \
@@ -55,6 +54,8 @@ OBJS = \
        obj/video.o \
        obj/vj.o \
        $(ICON)
+#      obj/cdbios.o 
+#      obj/cdi.o 
 
 all: obj $(TARGET)
 
@@ -85,7 +86,7 @@ $(TARGET): $(OBJS)
 # Other stuff that has unusual dependencies
 
 obj/gui.o: src/gui.cpp src/include/gui.h src/include/font1.h
-       $(THECC) -c src/gui.cpp -o obj/gui.o
+obj/cdintf.o: src/cdintf.cpp src/cdintf_win32.cpp src/cdintf_osx.cpp src/cdintf_linux.cpp src/include/cdintf.h
 
 #
 # Musashi specific stuffola