FIND = find
+ifeq ("$(V)","1")
+Q :=
+else
+Q := @
+endif
+
# Gah
OSTYPE := $(shell uname -a)
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)"
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 `date +%Y%m%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"
- @$(MAKE) -f makefile-qt CROSS=$(CROSS)
+ $(Q)$(MAKE) -f makefile-qt CROSS=$(CROSS) V="$(V)"
makefile-qt: virtualjaguar.pro
@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
- @$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
+ $(Q)$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
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 CROSS=$(CROSS) CFLAGS="$(CFLAGS)"
- @cp src/m68000/obj/libm68k.a obj/
+ $(Q)$(MAKE) -C src/m68000 CROSS=$(CROSS) CFLAGS="$(CFLAGS)" V="$(V)"
+ $(Q)cp src/m68000/obj/libm68k.a obj/
obj/libjaguarcore.a: jaguarcore.mak sources
@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar core...\033[00m"
- @$(MAKE) -f jaguarcore.mak CROSS=$(CROSS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+ $(Q)$(MAKE) -f jaguarcore.mak CROSS=$(CROSS) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" V="$(V)"
sources: src/*.h src/*.cpp src/m68000/*.c src/m68000/*.h