Fixed fullscreen<-->windowed mode swith in OpenGL mode, phase one of

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index d1bd6f0243509372c017066b8e177340fa10b01e..2d417f7938c8e62d9c844765324bea7197962609 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,13 @@
 # Unified Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator
 #
 # by James L. Hammons
-# This software is licensed under the GPL v2. Set the file GPL.TXT for details. ;-)
 #
+# This software is licensed under the GPL v2 or any later version. Set the
+# file GPL.TXT for details. ;-)
+#
+
+# NOTE: zlib and OpenGL libs are a dependency, but are not checked for.
+#       same goes for libcdio
 
 # Figure out which system we're compiling for, and set the appropriate variables
 
@@ -46,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)
+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
 
@@ -65,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       \
@@ -89,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
@@ -114,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