X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=f29871b2eb9200570aa4f9eead8fb8809627428a;hb=be2fdb272ceeb72d9c50e7d66b58cb73734980f9;hp=d1bd6f0243509372c017066b8e177340fa10b01e;hpb=7ac2f54164f3ba411ea8a8a528e104b3187249e7;p=virtualjaguar

diff --git a/Makefile b/Makefile
index d1bd6f0..f29871b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,41 +2,55 @@
 # 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. ;-)
 #
 
 # Figure out which system we're compiling for, and set the appropriate variables
 
-ifeq "$(OSTYPE)" "msys"							# Win32
+OSTYPE := $(shell uname -a)
 
-SYSTYPE    = __GCCWIN32__
-EXESUFFIX  = .exe
-GLLIB      = -lopengl32
-ICON       = obj/icon.o
-SDLLIBTYPE = --libs
-MSG        = Win32 on MinGW
+ifeq "$(findstring Msys,$(OSTYPE))" "Msys"			# Win32
 
-else
-#ifeq "$(OSTYPE)" "darwin"
-ifeq "darwin" "$(findstring darwin,$(OSTYPE))"	# Should catch both 'darwin' and 'darwin7.0'
+SYSTYPE    := __GCCWIN32__
+EXESUFFIX  := .exe
+GLLIB      := -lopengl32
+ICON       := obj/icon.o
+SDLLIBTYPE := --libs
+MSG        := Win32 on MinGW
+
+else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"	# Should catch both 'darwin' and 'darwin7.0'
 
-SYSTYPE    = __GCCUNIX__ -D_OSX_
-EXESUFFIX  =
-GLLIB      =
-ICON       =
-SDLLIBTYPE = --static-libs
-MSG        = Mac OS X
+SYSTYPE    := __GCCUNIX__ -D_OSX_
+EXESUFFIX  :=
+GLLIB      :=
+ICON       :=
+SDLLIBTYPE := --static-libs
+MSG        := Mac OS X
 
-else											# *nix
+else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"		# Linux
 
-SYSTYPE    = __GCCUNIX__
-EXESUFFIX  =
-GLLIB      = -lGL
-ICON       =
-SDLLIBTYPE = --libs
-MSG        = generic Unix/Linux
+SYSTYPE    := __GCCUNIX__
+EXESUFFIX  :=
+GLLIB      := -lGL -lGLU
+ICON       :=
+SDLLIBTYPE := --libs
+MSG        := GNU/Linux
+
+else											# ???
+
+$(error OS TYPE UNDETECTED)
 
 endif
+
+# Set vars for libcdio
+ifneq "$(shell pkg-config --silence-errors --libs libcdio)" ""
+HAVECDIO := -DHAVE_LIB_CDIO
+CDIOLIB  := -lcdio
+else
+HAVECDIO :=
+CDIOLIB  :=
 endif
 
 CC         = gcc
@@ -46,85 +60,145 @@ 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`
+		$(HAVECDIO) -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) $(CDIOLIB)
 
-INCS = -I. -I./src -I/usr/local/include -I/usr/include
+INCS = -I. -I./src -I./src/gui -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/button.o        \
+	obj/element.o       \
+	obj/filelist.o      \
+	obj/gui.o           \
+	obj/guimisc.o       \
+	obj/image.o         \
+	obj/listbox.o       \
+	obj/menu.o          \
+	obj/pushbutton.o    \
+	obj/slideswitch.o   \
+	obj/text.o          \
+	obj/textedit.o      \
+	obj/window.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       \
 	obj/jaguar.o        \
 	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/mmu.o           \
 	obj/objectp.o       \
 	obj/sdlemu_config.o \
 	obj/sdlemu_opengl.o \
 	obj/settings.o      \
+	obj/state.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 
+
+# Targets for convenience sake, not "real" targets
+.PHONY: clean
 
 all: checkenv message obj $(TARGET)$(EXESUFFIX)
 	@echo
-	@echo "*** Looks like it compiled OK... Give it a whirl!"
+	@echo -e "\033[01;33m***\033[00;32m Looks like it compiled OK... Give it a whirl!\033[00m"
+	@echo
 
 # Check the compilation environment, barf if not appropriate
 
-checkenv:
+checkenv: msg-check-env check-sdl check-zlib check-cdio check-gl ;
+
+#check-sdl: msg-ck-sdl $(if $(strip ),,msg-no-sdl stop-on-error)
+check-sdl: msg-ck-sdl $(if $(shell which sdl-config),,msg-no-sdl stop-on-error)
+	@echo -e "\033[01;37mOK\033[00m"
+
+msg-ck-sdl:
+	@echo -en "   \033[00;32mSDL... \033[00m"
+
+msg-no-sdl:
+	@echo -e "\033[01;37mNOT FOUND\033[00m"
 	@echo
-	@echo -n "*** Checking compilation environment... "
-ifeq "" "$(shell which sdl-config)"
+	@echo -e "\033[01;33mIt seems that you don't have the SDL development libraries installed. If you"
+	@echo -e "have installed them, make sure that the sdl-config file is somewhere in your"
+	@echo -e "path and is executable.\033[00m"
 	@echo
+
+check-zlib: msg-ck-zlib $(if $(shell pkg-config --silence-errors --libs zlib),,msg-no-zlib stop-on-error)
+	@echo -e "\033[01;37mOK\033[00m"
+
+msg-ck-zlib:
+	@echo -en "   \033[00;32mZLIB... \033[00m"
+
+msg-no-zlib:
+	@echo -e "\033[01;37mNOT FOUND\033[00m"
 	@echo
-	@echo "It seems that you don't have the SDL development libraries installed. If you"
-	@echo "have installed them, make sure that the sdl-config file is somewhere in your"
-	@echo "path and is executable."
+	@echo -e "\033[01;33mIt seems that you don't have ZLIB installed. If you have installed it, make"
+	@echo -e "sure that the pkg-config file is somewhere in your path and is executable.\033[00m"
+	@echo
+
+#NOTE that this check shouldn't be fatal, we can bounce back from it by excluding CD support
+check-cdio: msg-ck-cdio $(if $(CDIOLIB),msg-cdio,msg-no-cdio) ;
+
+msg-ck-cdio:
+	@echo -en "   \033[00;32mLIBCDIO... \033[00m"
+
+msg-cdio:
+	@echo -e "\033[01;37mOK\033[00m"
+
+msg-no-cdio:
+	@echo -e "\033[01;37mNOT FOUND\033[00m"
+	@echo
+	@echo -e "\033[01;33mIt seems that you don't have LIBCDIO installed. Since this is not fatal,"
+	@echo -e "Virtual Jaguar will be built WITHOUT CD support.\033[00m"
+	@echo
+
+check-gl: msg-ck-gl
+	@echo -e "*** GL CHECK NOT IMPLEMENTED ***"
+
+msg-ck-gl:
+	@echo -en "   \033[00;32mOpenGL... \033[00m"
+
+stop-on-error: ; $(error COMPILATION ENVIRONMENT)
+
+msg-check-env:
+	@echo
+	@echo -e "\033[01;33m***\033[00;32m Checking compilation environment: \033[00m"
 	@echo
-#Is there a better way to break out of the makefile?
-	@break
-else
-	@echo "OK"
-endif
 
 message:
 	@echo
-	@echo "*** Building Virtual Jaguar for $(MSG)..."
+	@echo -e "\033[01;33m***\033[00;32m Building Virtual Jaguar for $(MSG)...\033[00m"
 	@echo
 
 clean:
-	@echo -n "*** Cleaning out the garbage..."
+	@echo -en "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
 	@rm -rf obj
 	@rm -f ./$(TARGET)$(EXESUFFIX)
-	@echo done!
+	@echo -e "\033[01;37mdone!\033[00m"
 
 obj:
 	@mkdir obj
@@ -133,20 +207,24 @@ obj:
 
 ifneq "" "$(ICON)"
 $(ICON): res/$(TARGET).rc res/$(TARGET).ico
-	@echo \*\*\* Processing icon...
+	@echo -e "\033[01;33m***\033[00;32m Processing icon...\033[00m"
 	@windres -i res/$(TARGET).rc -o $(ICON) --include-dir=./res
 endif
 
 obj/%.o: src/%.c
-	@echo "*** Compiling $<..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
 	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
 
 obj/%.o: src/%.cpp
-	@echo "*** Compiling $<..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
+
+obj/%.o: src/gui/%.cpp
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
 	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
 $(TARGET)$(EXESUFFIX): $(OBJS)
-	@echo "*** Linking it all together..."
+	@echo -e "\033[01;33m***\033[00;32m Linking it all together...\033[00m"
 	@$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 #	strip --strip-all vj$(EXESUFFIX)
 #	upx -9 vj$(EXESUFFIX)
@@ -170,32 +248,32 @@ $(TARGET)$(EXESUFFIX): $(OBJS)
 #NOTE: The above doesn't work for some reason...
 
 obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h
-	@echo "*** Compiling m68kcpu.c..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling m68kcpu.c...\033[00m"
 	@$(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o
 
 obj/m68kops.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h
-	@echo "*** Compiling m68kops.c..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling m68kops.c...\033[00m"
 	@$(CC) $(CFLAGS) -Isrc -c obj/m68kops.c -o obj/m68kops.o
 
 obj/m68kopac.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h
-	@echo "*** Compiling m68kopac.c..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling m68kopac.c...\033[00m"
 	@$(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o
 
 obj/m68kopdm.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h
-	@echo "*** Compiling m68kopdm.c..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling m68kopdm.c...\033[00m"
 	@$(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o
 
 obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
-	@echo "*** Compiling m68kopnz.c..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling m68kopnz.c...\033[00m"
 	@$(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o
 
 obj/m68kdasm.o: src/m68kdasm.c src/m68k.h src/m68kconf.h
-	@echo "*** Compiling m68kdasm.c..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling m68kdasm.c...\033[00m"
 	@$(CC) $(CFLAGS) -Isrc -c src/m68kdasm.c -o obj/m68kdasm.o
 
 obj/m68kops.h: obj/m68kmake$(EXESUFFIX)
 	@obj/m68kmake obj src/m68k_in.c
 
 obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
-	@echo "*** Preparing to make the Musashi core..."
+	@echo -e "\033[01;33m***\033[00;32m Preparing to make the Musashi core...\033[00m"
 	@$(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)