X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=3a1a4dab305714a4c610a1e4d172635190a894e3;hb=d239de704f276a75d927900e3d413a44cc87116c;hp=d1bd6f0243509372c017066b8e177340fa10b01e;hpb=7ac2f54164f3ba411ea8a8a528e104b3187249e7;p=virtualjaguar diff --git a/Makefile b/Makefile index d1bd6f0..3a1a4da 100644 --- 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,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` + -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 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 \ @@ -72,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 \ @@ -85,13 +94,9 @@ OBJS = \ obj/settings.o \ obj/tom.o \ obj/unzip.o \ - obj/version.o \ 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 +119,7 @@ ifeq "" "$(shell which sdl-config)" else @echo "OK" endif +# !!! NOTE !!! Need to put a check here for libcdio, GL, etc. message: @echo