X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=4b6b4ea024bcf1b381258ddf6d575aed8616e49c;hb=4b629b399ccfba8ca942acbdb808938f0f1aabca;hp=63dec1cad661f293b643dee90a35edca9c2be274;hpb=67a95fc0511260daf0a92709e8a835a090b467d8;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 63dec1c..4b6b4ea 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,15 @@
 
 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"
 
@@ -20,27 +29,31 @@ prepare:
 	@echo "#define VJ_RELEASE_SUBVERSION \"2.0.0 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
+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
 	@echo -e "\033[01;33m***\033[00;32m Making Musashi...\033[00m"
 	$(MAKE) -f musashi.mak
 
+obj/libjaguarcore.a: jaguarcore.mak
+	@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"
 	@-rm -rf ./obj
-	@-rm makefile-qt
-	@-rm virtualjaguar
+	@-rm -rf makefile-qt
+	@-rm -rf virtualjaguar
 	@-$(FIND) . -name "*~" -exec rm -f {} \;
 	@echo "done!"