X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=3a1a4dab305714a4c610a1e4d172635190a894e3;hb=d239de704f276a75d927900e3d413a44cc87116c;hp=f9484cdf13c1b0c67369f31c76351161c6ad89c8;hpb=731669ecc1eb876e42104a8a4ba49ac00572c020;p=virtualjaguar

diff --git a/Makefile b/Makefile
index f9484cd..3a1a4da 100644
--- a/Makefile
+++ b/Makefile
@@ -51,25 +51,35 @@ TARGET     = vj
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
 CFLAGS   = -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl-config --cflags`
 CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
-		-ffast-math -fomit-frame-pointer `sdl-config --cflags` -g
+		-DHAVE_LIB_CDIO -ffast-math -fomit-frame-pointer `sdl-config --cflags` -g
 #		-fomit-frame-pointer `sdl-config --cflags` -g
 #		-fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS =
 
 LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lcdio
+# Comment out the above and uncomment below if you don't have libcdio.
+# Also, remove the "-DHAVE_LIB_CDIO" from CPPFLAGS above.
+#LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 
 INCS = -I. -I./src -I/usr/local/include -I/usr/include
 
 OBJS = \
+	obj/m68kcpu.o       \
+	obj/m68kops.o       \
+	obj/m68kopac.o      \
+	obj/m68kopdm.o      \
+	obj/m68kopnz.o      \
+	obj/m68kdasm.o      \
 	obj/blitter.o       \
 	obj/cdrom.o         \
 	obj/cdintf.o        \
-	obj/clock.o         \
 	obj/crc32.o         \
 	obj/dac.o           \
 	obj/dsp.o           \
 	obj/eeprom.o        \
+	obj/event.o         \
+	obj/file.o          \
 	obj/gpu.o           \
 	obj/gui.o           \
 	obj/jagdasm.o       \
@@ -77,12 +87,6 @@ OBJS = \
 	obj/jerry.o         \
 	obj/joystick.o      \
 	obj/log.o           \
-	obj/m68kcpu.o       \
-	obj/m68kops.o       \
-	obj/m68kopac.o      \
-	obj/m68kopdm.o      \
-	obj/m68kopnz.o      \
-	obj/m68kdasm.o      \
 	obj/memory.o        \
 	obj/objectp.o       \
 	obj/sdlemu_config.o \
@@ -90,7 +94,6 @@ OBJS = \
 	obj/settings.o      \
 	obj/tom.o           \
 	obj/unzip.o         \
-	obj/version.o       \
 	obj/video.o         \
 	obj/vj.o            \
 	$(ICON)
@@ -116,6 +119,7 @@ ifeq "" "$(shell which sdl-config)"
 else
 	@echo "OK"
 endif
+# !!! NOTE !!! Need to put a check here for libcdio, GL, etc.
 
 message:
 	@echo