Rework CFLAGS & CXXFLAGS

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index 88763de9fa39c411a2866dce3ddbed1aab9b0ed2..4b30a7890df1e346f2d81efdc814b5d1fefc6631 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,17 @@ 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 ?= 
+# Set basic flags, these can be overridden from the environment
+CFLAGS = -O2
+CXXFLAGS = -O2
+
+# Add CPPFLAGS
+CFLAGS += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
+
+# Without these flags, Virtual Jaguar will run very slow.
+CFLAGS += -ffast-math -fomit-frame-pointer
+CXXFLAGS += -ffast-math -fomit-frame-pointer
 
 # Flags to pass on to qmake...
 QMAKE_EXTRA += "QMAKE_CFLAGS_RELEASE=$(CFLAGS)"
@@ -42,10 +47,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.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
+#      @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
 
 virtualjaguar: sources libs makefile-qt
        @echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"