X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=7a647961926ab8bc07ddb6344d58220fb70321f9;hb=8d86cf72ca34826359e2aaf958909e23a47194cf;hp=f2949a885111519523e26f801d434aae246b00f4;hpb=97421b051237fbe8e117436101a9fedec417faa0;p=virtualjaguar diff --git a/Makefile b/Makefile index f2949a8..7a64796 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.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 + @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.4 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"