Minor tweaks to Makefiles, added command line switches for most options.

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index 761360af08a7e04c7949bffe434c0b766de00ee0..4dfadf4b2321e3e8e3f7f7782a71e8bddd747d1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,20 @@ ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
 QMAKE_EXTRA := -spec macx-g++
 endif
 
+# Eh?
+CFLAGS ?= ""
+CPPFLAGS ?= ""
+CXXFLAGS ?= ""
+LDFLAGS ?= ""
+
+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,10 +40,10 @@ 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.2\"" > 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 \"SVN `svn info | grep -i revision`\"" > src/version.h
-       @echo "#define VJ_RELEASE_SUBVERSION \"2.0.2 Prerelease\"" >> 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"
@@ -45,7 +59,8 @@ libs: obj/libm68k.a obj/libjaguarcore.a
 
 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
+       @$(MAKE) -C src/m68000 CFLAGS="$(CFLAGS)"
        @cp src/m68000/obj/libm68k.a obj/
 
 obj/libmusashi.a: musashi.mak sources
@@ -54,7 +69,8 @@ obj/libmusashi.a: musashi.mak sources
 
 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
+       $(MAKE) -f jaguarcore.mak CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 
 sources: src/*.h src/*.cpp src/*.c src/m68000/*.c src/m68000/*.h