X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=2d417f7938c8e62d9c844765324bea7197962609;hb=f3e5bb2807319c210d124d6150e019130c54867b;hp=16010605ece9d6a933239a7854f744c0e653e144;hpb=683f283e1328164c176618088c34408ea6c03cf7;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 1601060..2d417f7 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,16 @@ 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`
+		-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
 
@@ -70,6 +73,7 @@ OBJS = \
 	obj/dac.o           \
 	obj/dsp.o           \
 	obj/eeprom.o        \
+	obj/file.o          \
 	obj/gpu.o           \
 	obj/gui.o           \
 	obj/jagdasm.o       \
@@ -94,9 +98,6 @@ OBJS = \
 	obj/video.o         \
 	obj/vj.o            \
 	$(ICON)
-#	obj/anajoy.o 
-#	obj/cdbios.o 
-#	obj/cdi.o 
 
 all: checkenv message obj $(TARGET)$(EXESUFFIX)
 	@echo
@@ -119,6 +120,7 @@ ifeq "" "$(shell which sdl-config)"
 else
 	@echo "OK"
 endif
+# !!! NOTE !!! Need to put a check here for libcdio, GL, etc.
 
 message:
 	@echo