X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=88763de9fa39c411a2866dce3ddbed1aab9b0ed2;hb=04a4d0db6f20955f132491173c4ec8e11d1e5de1;hp=03de51b29060be8e895b29bb94b3bb1f718f9ab0;hpb=f30bf746981a99079e766b0d4e9de5391a4175ff;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 03de51b..88763de 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,22 @@ ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
 QMAKE_EXTRA := -spec macx-g++
 endif
 
+# (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 ?= 
+
+# Flags to pass on to qmake...
+QMAKE_EXTRA += "QMAKE_CFLAGS_RELEASE=$(CFLAGS)"
+QMAKE_EXTRA += "QMAKE_CXXFLAGS_RELEASE=$(CXXFLAGS)"
+QMAKE_EXTRA += "QMAKE_LFLAGS_RELEASE=$(LDFLAGS)"
+
+QMAKE_EXTRA += "QMAKE_CFLAGS_DEBUG=$(CFLAGS)"
+QMAKE_EXTRA += "QMAKE_CXXFLAGS_DEBUG=$(CXXFLAGS)"
+QMAKE_EXTRA += "QMAKE_LFLAGS_DEBUG=$(LDFLAGS)"
+
 
 all: prepare virtualjaguar
 	@echo -e "\033[01;33m***\033[00;32m Success!\033[00m"
@@ -26,37 +42,32 @@ obj:
 
 prepare: obj
 	@echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m"
-#	@echo "#define VJ_RELEASE_VERSION \"v2.0.3\"" > 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.3 Prerelease\"" >> src/version.h
+	@echo "#define VJ_RELEASE_VERSION \"v2.1.0\"" > 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.0 Prerelease\"" >> src/version.h
 
 virtualjaguar: sources libs makefile-qt
 	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"
-	$(MAKE) -f makefile-qt
+	@$(MAKE) -f makefile-qt CROSS=$(CROSS)
 
 makefile-qt: virtualjaguar.pro
 	@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
-	qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
+	@$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
 
-#libs: obj/libmusashi.a obj/libjaguarcore.a
 libs: obj/libm68k.a obj/libjaguarcore.a
 	@echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"
 
 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
+	@$(MAKE) -C src/m68000 CROSS=$(CROSS) CFLAGS="$(CFLAGS)"
 	@cp src/m68000/obj/libm68k.a obj/
 
-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
+	@$(MAKE) -f jaguarcore.mak CROSS=$(CROSS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 
-sources: src/*.h src/*.cpp src/*.c src/m68000/*.c src/m68000/*.h
+sources: src/*.h src/*.cpp src/m68000/*.c src/m68000/*.h
 
 clean:
 	@echo -ne "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"