X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=c4a771f55745b5be862cd2ea79f7919118f24d24;hb=8e680eb382eceb22f52cb923958ac652d693eb1a;hp=0bc48d47b32f1e9b241550e9a7796300ec983b51;hpb=6db85f3eb45844bc9c2aaeb3cf222d8a438796dd;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 0bc48d4..c4a771f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,116 +1,252 @@
 #
 # Unified Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator
 #
-# Note that SYSTYPE, EXESUFFIX, GLLIB, ICON, and SDLLIBTYPE are passed in by the
-# script called "compile". The unified makefile should make life a little
-# easier for the maintainers. :-)
+# by James L. Hammons
 #
+# This software is licensed under the GPL v2 or any later version. See 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
+
+ifeq "$(OSTYPE)" "msys"							# Win32
+
+SYSTYPE    = __GCCWIN32__
+EXESUFFIX  = .exe
+GLLIB      = -lopengl32
+ICON       = obj/icon.o
+SDLLIBTYPE = --libs
+MSG        = Win32 on MinGW
+
+else
+#ifeq "$(OSTYPE)" "darwin"
+ifeq "darwin" "$(findstring darwin,$(OSTYPE))"	# Should catch both 'darwin' and 'darwin7.0'
+
+SYSTYPE    = __GCCUNIX__ -D_OSX_
+EXESUFFIX  =
+GLLIB      =
+ICON       =
+SDLLIBTYPE = --static-libs
+MSG        = Mac OS X
+
+else											# *nix
+
+SYSTYPE    = __GCCUNIX__
+EXESUFFIX  =
+GLLIB      = -lGL -lGLU
+ICON       =
+SDLLIBTYPE = --libs
+MSG        = generic Unix/Linux
+
+endif
+endif
 
 CC         = gcc
 LD         = gcc
-TARGET     = vj$(EXESUFFIX)
+TARGET     = vj
 
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
-CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
-		-fomit-frame-pointer `sdl-config --cflags`
+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) -Wno-trigraphs \
+		-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 `pkg-config --libs QtGui QtOpenGL`
+# 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. -Isrc -Isrc/include -I/usr/local/include -I/usr/include
-
-THECC = $(CC) $(CFLAGS) $(INCS)
+INCS = -I. -I./src -I./src/gui -I/usr/local/include -I/usr/include
 
 OBJS = \
-	obj/anajoy.o \
-	obj/blitter.o \
-	obj/cdbios.o \
-	obj/cdi.o \
-	obj/cdrom.o \
-	obj/clock.o \
-	obj/crc32.o \
-	obj/dac.o \
-	obj/dsp.o \
-	obj/eeprom.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/objectp.o \
+	obj/m68kcpu.o       \
+	obj/m68kops.o       \
+	obj/m68kopac.o      \
+	obj/m68kopdm.o      \
+	obj/m68kopnz.o      \
+	obj/m68kdasm.o      \
+\
+	obj/about.o         \
+	obj/app.o           \
+	obj/configwin.o     \
+	obj/filepicker.o    \
+	obj/moc_filepicker.o \
+	obj/filelistmodel.o \
+	obj/filethread.o    \
+	obj/imagedelegate.o \
+	obj/moc_filethread.o \
+	obj/mainwin.o       \
+	obj/moc_mainwin.o   \
+	obj/glwidget.o      \
+	obj/moc_glwidget.o  \
+	obj/qrc_vj.o        \
+\
+	obj/blitter.o       \
+	obj/cdrom.o         \
+	obj/cdintf.o        \
+	obj/crc32.o         \
+	obj/dac.o           \
+	obj/dsp.o           \
+	obj/eeprom.o        \
+	obj/event.o         \
+	obj/file.o          \
+	obj/gpu.o           \
+	obj/jagdasm.o       \
+	obj/jaguar.o        \
+	obj/jerry.o         \
+	obj/joystick.o      \
+	obj/log.o           \
+	obj/memory.o        \
+	obj/mmu.o           \
+	obj/objectp.o       \
 	obj/sdlemu_config.o \
 	obj/sdlemu_opengl.o \
-	obj/settings.o \
-	obj/tom.o \
-	obj/unzip.o \
-	obj/version.o \
-	obj/video.o \
-	obj/vj.o \
+	obj/settings.o      \
+	obj/state.o         \
+	obj/tom.o           \
+	obj/unzip.o         \
+	obj/video.o         \
+	obj/vj.o            \
+	obj/wavetable.o     \
 	$(ICON)
 
-all: obj $(TARGET)
+all: checkenv message obj $(TARGET)$(EXESUFFIX)
+	@echo
+	@echo -e "\033[01;33m***\033[00;32m Looks like it compiled OK... Give it a whirl!\033[00m"
+
+# Check the compilation environment, barf if not appropriate
+
+checkenv:
+	@echo
+	@echo -en "\033[01;33m***\033[00;32m Checking compilation environment... \033[00m"
+ifeq "" "$(shell which sdl-config)"
+	@echo
+	@echo
+	@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
+#Is there a better way to break out of the makefile?
+	@breaky
+else
+	@echo -e "\033[01;37mOK\033[00m"
+endif
+# !!! NOTE !!! Need to put a check here for libcdio, GL, zlib, Qt
+
+message:
+	@echo
+	@echo -e "\033[01;33m***\033[00;32m Building Virtual Jaguar for $(MSG)...\033[00m"
+	@echo
 
 clean:
-	rm -rf obj
-	rm -f ./vj$(EXESUFFIX)
+	@echo
+	@echo -en "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
+	@rm -rf obj
+	@rm -f ./$(TARGET)$(EXESUFFIX)
+	@echo -e "\033[01;37mdone!\033[00m"
 
 obj:
-	mkdir obj
+	@mkdir obj
+
+# This is only done for Win32 at the moment...
 
-obj/%.o: src/%.c src/include/%.h
-	$(THECC) -c $< -o $@
+ifneq "" "$(ICON)"
+$(ICON): res/$(TARGET).rc res/$(TARGET).ico
+	@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/%.cpp src/include/%.h
-	$(THECC) -c $< -o $@
+# Main source compilation...
 
 obj/%.o: src/%.c
-	$(THECC) -c $< -o $@
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
 
 obj/%.o: src/%.cpp
-	$(THECC) -c $< -o $@
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
-$(TARGET): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+#$(TARGET)$(EXESUFFIX): $(OBJS)
+$(TARGET)$(EXESUFFIX): $(OBJS)
+	@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)
 
-# Other stuff that has unusual dependencies
-
-obj/gui.o: src/gui.cpp src/include/gui.h src/include/font1.h
-	$(THECC) -c src/gui.cpp -o obj/gui.o
+# Qt GUI stuff...
+
+src/gui/Makefile: src/gui/vj-gui.pro src/gui/vj-gui.qrc
+	@echo -e "\033[01;33m***\033[00;32m Creating Qt Makefile...\033[00m"
+	@qmake -o src/gui/Makefile src/gui/vj-gui.pro
+
+#obj/%.o: src/gui/%.cpp src/gui/Makefile
+#	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+#	@make -C src/gui
+#OR:
+#	@cd src/gui && make
+
+#QT_SOURCES       = app.cpp \
+#		mainwin.cpp ../../obj/moc_mainwin.cpp \
+#		../../obj/qrc_vj-gui.cpp
+#QT_OBJECTS       = ../../obj/app.o \
+#		../../obj/mainwin.o \
+#		../../obj/moc_mainwin.o \
+#		../../obj/qrc_vj-gui.o
+QT_CFLAGS = -MMD `pkg-config --cflags QtGui`
+# !!! THESE DEFINES ARE PLATFORM DEPENDENT !!!
+#QT_DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+QT_DEFINES = -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+#QT_INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I./src/gui -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I./obj
+QT_INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I./src -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4 -I/usr/X11R6/include -I./obj
+QT_CXXFLAGS = -MMD -pipe -O2 -march=pentium-m -pipe -D_REENTRANT -Wall -W $(QT_DEFINES) -D$(SYSTYPE)
+
+obj/moc_%.cpp: src/gui/%.h
+	@echo -e "\033[01;33m***\033[00;32m Creating $@...\033[00m"
+	@/usr/bin/moc $(QT_DEFINES) $(QT_INCPATH) $< -o $@
+
+obj/moc_%.o: obj/moc_%.cpp
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) -c $(QT_CXXFLAGS) $(QT_INCPATH) -o $@ $<
+
+obj/qrc_vj.cpp: src/gui/vj.qrc res/vj.xpm
+	@echo -e "\033[01;33m***\033[00;32m Creating qrc_vj.cpp...\033[00m"
+	@/usr/bin/rcc -name vj src/gui/vj.qrc -o obj/qrc_vj.cpp
+
+obj/qrc_%.o: obj/qrc_%.cpp
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) -c $(QT_CXXFLAGS) $(QT_INCPATH) -o $@ $<
+
+obj/%.o: src/gui/%.cpp src/gui/%.h
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) -c $(QT_CXXFLAGS) $(QT_INCPATH) -o $@ $<
 
 #
 # Musashi specific stuffola
 #
 
-obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h
-	$(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
-	$(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
-	$(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o
+obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
+	@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)
 
-obj/m68kopdm.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h
-	$(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o
+obj/m68kops.h obj/m68kops.c obj/m68kopac.c obj/m68kopdm.c obj/m68kopnz.c: obj/m68kmake$(EXESUFFIX)
+	@echo -e "\033[01;33m***\033[00;32m Creating m68kops.h...\033[00m"
+	@obj/m68kmake obj src/m68k_in.c
 
-obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
-	$(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o
+obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h
+	@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/m68kdasm.o: src/m68kdasm.c src/m68k.h src/m68kconf.h
-	$(CC) $(CFLAGS) -Isrc -c src/m68kdasm.c -o obj/m68kdasm.o
+obj/m68kop%.o: obj/m68kop%.c
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) $(CFLAGS) -Isrc -c $< -o $@
 
-obj/m68kops.h: obj/m68kmake$(EXESUFFIX)
-	obj/m68kmake obj src/m68k_in.c
+# Pull in dependencies autogenerated by gcc's -MMD switch
+# The "-" in front is there just in case they haven't been created yet
 
-obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
-	$(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)
+-include obj/*.d