X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=7d8d132b65b81776ddb80d7904fc77f05b1cec59;hb=413aeb099b2982e60bc095a7e404fd2fefff4d7f;hp=b2cffbadf16ff2c497271a0cd82d9f28d567bcca;hpb=287f2fa2ff95d828e400294f10ca215314960e72;p=virtualjaguar

diff --git a/Makefile b/Makefile
index b2cffba..7d8d132 100644
--- a/Makefile
+++ b/Makefile
@@ -8,20 +8,16 @@
 
 CC         = gcc
 LD         = gcc
-TARGET     = vj
+TARGET     = vj$(EXESUFFIX)
 
-#Why substitute strcasecmp for stricmp? Isn't stricmp standard?
-#CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) -Dstricmp="strcasecmp" 
+# 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
 
-#Why? Seems like it's wrong...
-#LDFLAGS = $(CFLAGS)
 LDFLAGS =
 
-#LIBS = -L/usr/local/lib -L/usr/lib `sdl-config --libs` -lstdc++ -lz $(GLLIB)
 LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 
 INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include
@@ -31,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 \
@@ -59,6 +54,8 @@ OBJS = \
 	obj/video.o \
 	obj/vj.o \
 	$(ICON)
+#	obj/cdbios.o 
+#	obj/cdi.o 
 
 all: obj $(TARGET)
 
@@ -69,13 +66,19 @@ clean:
 obj:
 	mkdir obj
 
+obj/%.o: src/%.c src/include/%.h
+	$(THECC) -c $< -o $@
+
+obj/%.o: src/%.cpp src/include/%.h
+	$(THECC) -c $< -o $@
+
 obj/%.o: src/%.c
 	$(THECC) -c $< -o $@
 
 obj/%.o: src/%.cpp
 	$(THECC) -c $< -o $@
 
-vj: $(OBJS)
+$(TARGET): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 #	strip --strip-all vj$(EXESUFFIX)
 #	upx -9 vj$(EXESUFFIX)
@@ -83,7 +86,7 @@ vj: $(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