X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=0fcad72aae842d2d4465f13035487509e5447252;hb=bae593a9f2f6557d271d8b2eacc5d4a825cf4b0a;hp=d408ad1e7179a6e08a2c9fce13de1d264dbbc0b0;hpb=f548beede257a2252a2639e3fe03c7cda99433ed;p=virtualjaguar

diff --git a/Makefile b/Makefile
index d408ad1..0fcad72 100644
--- a/Makefile
+++ b/Makefile
@@ -2,38 +2,58 @@
 #
 # by James Hammons
 # (C) 2011 Underground Software
+#
+# Note that we control the version information here--uncomment only one set of
+# echo's from the "prepare" recipe. :-)
+#
 
 FIND = find
 
+# Gah
+OSTYPE := $(shell uname -a)
+
+# Should catch both 'darwin' and 'darwin7.0'
+ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
+QMAKE_EXTRA := -spec macx-g++
+endif
+
+
 all: prepare virtualjaguar
 	@echo -e "\033[01;33m***\033[00;32m Success!\033[00m"
 
 prepare:
 	@echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m"
+#	@echo "#define VJ_RELEASE_VERSION \"v2.0.1\"" > src/version.h
+#	@echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
+	@echo "#define VJ_RELEASE_VERSION \"SVN `svn info | grep -i revision`\"" > src/version.h
+	@echo "#define VJ_RELEASE_SUBVERSION \"2.0.1 Prerelease\"" >> src/version.h
 
 virtualjaguar: sources libs makefile-qt
-	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar...\033[00m"
+	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"
 	$(MAKE) -f makefile-qt
 
 makefile-qt: virtualjaguar.pro
 	@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
-	qmake virtualjaguar.pro -o makefile-qt
+	qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
 
-libs: obj/libmusashi.a
-	@echo -e "\033[01;33m***\033[00;32m Make libs here (if any)...\033[00m"
+libs: obj/libmusashi.a obj/libjaguarcore.a
+	@echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"
 
-obj/libmusashi.a:
+obj/libmusashi.a: musashi.mak sources
 	@echo -e "\033[01;33m***\033[00;32m Making Musashi...\033[00m"
 	$(MAKE) -f musashi.mak
 
+obj/libjaguarcore.a: jaguarcore.mak sources
+	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar core...\033[00m"
+	$(MAKE) -f jaguarcore.mak
+
 sources: src/*.h src/*.cpp src/*.c
 
 clean:
 	@echo -ne "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
-#	@-$(MAKE) -f makefile-qt clean
 	@-rm -rf ./obj
-	@-rm makefile-qt
-	@-rm virtualjaguar
+	@-rm -rf makefile-qt
+	@-rm -rf virtualjaguar
 	@-$(FIND) . -name "*~" -exec rm -f {} \;
 	@echo "done!"