X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=edc1d20c7e035efa03b8b33546cd9912fd39b65d;hb=25646c0a48be1832e20fd4fcdd2d40ba2174bfa3;hp=17385f8d27ea41c29bed43bc99a57629f5869374;hpb=e0a3f430ecbda85e5f0903011bf8ffeb01f10fe0;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 17385f8..edc1d20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,318 +1,87 @@
+# Makefile for Virtual Jaguar
 #
-# Unified Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator
+# by James Hammons
+# (C) 2011 Underground Software
 #
-# by James L. Hammons
+# Note that we control the version information here--uncomment only one set of
+# echo's from the "prepare" recipe. :-)
 #
-# This software is licensed under the GPL v2 or any later version. See the
-# file GPL.TXT for details. ;-)
-#
-
-# NOTE: Qt and OpenGL libs are a dependency, but are not checked for.
 
-# Figure out which system we're compiling for, and set the appropriate variables
+FIND = find
 
+# Gah
 OSTYPE := $(shell uname -a)
 
-ifeq "$(findstring Msys,$(OSTYPE))" "Msys"			# Win32
-
-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
-
-else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"		# Linux
-
-SYSTYPE    := __GCCUNIX__
-EXESUFFIX  :=
-GLLIB      := -lGL -lGLU
-ICON       :=
-SDLLIBTYPE := --libs
-MSG        := GNU/Linux
-
-else											# ???
-
-$(error OS TYPE UNDETECTED)
-
+# Should catch both 'darwin' and 'darwin7.0'
+ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
+QMAKE_EXTRA := -spec macx-g++
 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
-LD         := gcc
-TARGET     := virtualjaguar
-
-# 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) -Wno-trigraphs \
-		$(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) $(CDIOLIB) `pkg-config --libs QtGui QtOpenGL`
-
-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/configdialog.o      \
-	obj/moc_configdialog.o  \
-	obj/generaltab.o        \
-	obj/moc_generaltab.o    \
-	obj/controllertab.o     \
-	obj/moc_controllertab.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_virtualjaguar.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/filedb.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/state.o         \
-	obj/tom.o           \
-	obj/unzip.o         \
-	obj/video.o         \
-	obj/virtualjaguar.o \
-	obj/wavetable.o     \
-	$(ICON)
-
-# Targets for convenience sake, not "real" targets
-.PHONY: clean
-
-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"
-	@echo
-
-# Check the compilation environment, barf if not appropriate
-
-checkenv: msg-check-env check-sdl check-zlib check-cdio check-gl check-qt ;
-
-#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 -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 -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
+# (This will only assign if the var doesn't exist already. Without these flags,
+# Virtual Jaguar will run very slow.)
+CFLAGS ?= -O2 -ffast-math -fomit-frame-pointer
+CPPFLAGS ?= -O2 -ffast-math -fomit-frame-pointer
+CXXFLAGS ?= -O2 -ffast-math -fomit-frame-pointer
+LDFLAGS ?= 
 
-#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) ;
+# Flags to pass on to qmake...
+QMAKE_EXTRA += "QMAKE_CFLAGS_RELEASE=$(CFLAGS)"
+QMAKE_EXTRA += "QMAKE_CXXFLAGS_RELEASE=$(CXXFLAGS)"
+QMAKE_EXTRA += "QMAKE_LFLAGS_RELEASE=$(LDFLAGS)"
 
-msg-ck-cdio:
-	@echo -en "   \033[00;32mLIBCDIO... \033[00m"
+QMAKE_EXTRA += "QMAKE_CFLAGS_DEBUG=$(CFLAGS)"
+QMAKE_EXTRA += "QMAKE_CXXFLAGS_DEBUG=$(CXXFLAGS)"
+QMAKE_EXTRA += "QMAKE_LFLAGS_DEBUG=$(LDFLAGS)"
 
-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"
-
-check-qt: msg-ck-qt
-	@echo -e "*** QT CHECK NOT IMPLEMENTED ***"
-
-msg-ck-qt:
-	@echo -en "   \033[00;32mQt... \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
-
-message:
-	@echo
-	@echo -e "\033[01;33m***\033[00;32m Building Virtual Jaguar for $(MSG)...\033[00m"
-	@echo
-
-clean:
-	@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"
+all: prepare virtualjaguar
+	@echo -e "\033[01;33m***\033[00;32m Success!\033[00m"
 
 obj:
 	@mkdir obj
 
-# This is only done for Win32 at the moment...
-
-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
-
-# Main source compilation (implicit rules)...
-
-obj/%.o: src/%.c
-	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
-
-obj/%.o: src/%.cpp
-	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
+prepare: obj
+	@echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m"
+#	@echo "#define VJ_RELEASE_VERSION \"v2.1.1\"" > src/version.h
+#	@echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
+	@echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h
+	@echo "#define VJ_RELEASE_SUBVERSION \"2.1.1 Prerelease\"" >> src/version.h
 
-#$(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)
+virtualjaguar: sources libs makefile-qt
+	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"
+	@$(MAKE) -f makefile-qt CROSS=$(CROSS)
 
-# Qt GUI stuff...
+makefile-qt: virtualjaguar.pro
+	@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
+	@$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
 
-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
+libs: obj/libm68k.a obj/libjaguarcore.a
+	@echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"
 
-#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
+obj/libm68k.a: src/m68000/Makefile sources
+	@echo -e "\033[01;33m***\033[00;32m Making Customized UAE 68K Core...\033[00m"
+	@$(MAKE) -C src/m68000 CROSS=$(CROSS) CFLAGS="$(CFLAGS)"
+	@cp src/m68000/obj/libm68k.a obj/
 
-#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 `sdl-config --cflags`
-QT_CXXFLAGS = -MMD -pipe -O2 -march=pentium-m -pipe -D_REENTRANT -Wall -W $(QT_DEFINES) -D$(SYSTYPE) -g
+obj/libjaguarcore.a: jaguarcore.mak sources
+	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar core...\033[00m"
+	@$(MAKE) -f jaguarcore.mak CROSS=$(CROSS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 
-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 $@
+sources: src/*.h src/*.cpp src/m68000/*.c src/m68000/*.h
 
-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_virtualjaguar.cpp: src/gui/virtualjaguar.qrc res/vj.xpm
-	@echo -e "\033[01;33m***\033[00;32m Creating qrc_virtualjaguar.cpp...\033[00m"
-	@/usr/bin/rcc -name virtualjaguar src/gui/virtualjaguar.qrc -o obj/qrc_virtualjaguar.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/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/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 -e "\033[01;33m***\033[00;32m Compiling m68kcpu.c...\033[00m"
-	@$(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o
-
-obj/m68kop%.o: obj/m68kop%.c
-	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(CFLAGS) -Isrc -c $< -o $@
-
-# 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
+clean:
+	@echo -ne "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
+	@-rm -rf ./obj
+	@-rm -rf ./src/m68000/obj
+	@-rm -rf makefile-qt
+	@-rm -rf virtualjaguar
+	@-$(FIND) . -name "*~" -exec rm -f {} \;
+	@echo "done!"
+
+statistics:
+	@echo -n "Lines in source files: "
+	@-$(FIND) ./src -name "*.cpp" | xargs cat | wc -l
+	@echo -n "Lines in header files: "
+	@-$(FIND) ./src -name "*.h" | xargs cat | wc -l
+
+dist:	clean