X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=2c3d82eaa6c21276ca4604e3c9565ed7ad5f315a;hb=b54bb3c04ba861123e44b7f25fbc859d78627379;hp=3746100cbe479fdc36c5f6f283e3277114600e9a;hpb=34eb947551354f437ed67e2f0a3b88e186f47561;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 3746100..2c3d82e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 # by James L. Hammons
 #
-# This software is licensed under the GPL v2 or any later version. Set the
+# This software is licensed under the GPL v2 or any later version. See the
 # file GPL.TXT for details. ;-)
 #
 
@@ -36,7 +36,7 @@ else											# *nix
 
 SYSTYPE    = __GCCUNIX__
 EXESUFFIX  =
-GLLIB      = -lGL
+GLLIB      = -lGL -lGLU
 ICON       =
 SDLLIBTYPE = --libs
 MSG        = generic Unix/Linux
@@ -50,87 +50,102 @@ 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) \
+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) -lcdio
+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. -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/about.o         \
+	obj/app.o           \
+	obj/configwin.o     \
+	obj/filepicker.o    \
+	obj/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/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            \
+	obj/wavetable.o     \
 	$(ICON)
 
 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"
 
 # Check the compilation environment, barf if not appropriate
 
 checkenv:
 	@echo
-	@echo -n "*** Checking compilation environment... "
+	@echo -en "\033[01;33m***\033[00;32m Checking compilation environment... \033[00m"
 ifeq "" "$(shell which sdl-config)"
 	@echo
 	@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 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?
-	@break
+	@breaky
 else
-	@echo "OK"
+	@echo -e "\033[01;37mOK\033[00m"
 endif
-# !!! NOTE !!! Need to put a check here for libcdio, GL, etc.
+# !!! NOTE !!! Need to put a check here for libcdio, GL, zlib, Qt
 
 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
+	@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
@@ -139,69 +154,95 @@ 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
 
+# Main source compilation...
+
 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 $@
 
+#$(TARGET)$(EXESUFFIX): $(OBJS)
 $(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)
 
-# Pull in dependencies autogenerated by gcc's -MMD switch
-# The "-" in front is there just in case they haven't been created yet
-
--include obj/*.d
+# 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/m68k%.o: obj/m68k%.c obj/m68kops.h
-#	$(CC) $(CFLAGS) -Iobj -c src/m68k%.c -o obj/m68k%.o
-
-#obj/m68k%.o: obj/m68k%.c obj/m68kmake$(EXESUFFIX)
-#	$(CC) $(CFLAGS) -Iobj -c src/m68k%.c -o obj/m68k%.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)
 
-#see if you can collapse all this crap into one or two lines...
-#NOTE: The above doesn't work for some reason...
+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/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..."
-	@$(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..."
-	@$(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..."
-	@$(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o
+obj/m68kop%.o: obj/m68kop%.c
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) $(CFLAGS) -Isrc -c $< -o $@
 
-obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
-	@echo "*** Compiling m68kopnz.c..."
-	@$(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..."
-	@$(CC) $(CFLAGS) -Isrc -c src/m68kdasm.c -o obj/m68kdasm.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
-	@echo "*** Preparing to make the Musashi core..."
-	@$(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)
+-include obj/*.d