X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=29f5f498e36aa7437da84eb90cfcbef689244361;hb=c9d57b57d70ab2ae842144828175820fb207a3b0;hp=eabcac91e04c0cff42ea9454224e4bba6e6bf05e;hpb=3b0e8e7d6be25106bcfa0ee0c78faed597e9a2c6;p=virtualjaguar diff --git a/Makefile b/Makefile index eabcac9..29f5f49 100644 --- a/Makefile +++ b/Makefile @@ -53,10 +53,11 @@ 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.2\"" > src/version.h +# @echo "#define VJ_RELEASE_VERSION \"v2.1.3\"" > src/version.h # @echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h +# @echo "#define VJ_REMOVE_DEV_CODE" >> 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.2 Prerelease\"" >> src/version.h + @echo "#define VJ_RELEASE_SUBVERSION \"2.1.3 Prerelease\"" >> src/version.h virtualjaguar: sources libs makefile-qt @echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m" @@ -64,7 +65,7 @@ virtualjaguar: sources libs makefile-qt makefile-qt: virtualjaguar.pro @echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m" - $(Q)$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt + $(Q)$(CROSS)qmake -qt=5 $(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"