From 8e61a7d3d37d0ceaf2f6af0a460d2f9c692e5252 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 16 Nov 2016 20:57:40 +0100 Subject: Added VS2017 support into project files (nw) --- makefile | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'makefile') diff --git a/makefile b/makefile index 650b864a953..e7ff63c1fe6 100644 --- a/makefile +++ b/makefile @@ -1055,6 +1055,45 @@ ifdef FASTBUILD $(SILENT) fbuild.exe -config $(PROJECTDIR_WIN)/vs2015-fastbuild/ftbuild.bff $(FASTBUILD_PARAMS) endif +#------------------------------------------------- +# Visual Studio 2017 +#------------------------------------------------- + +.PHONY: vs2017 +vs2017: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2017 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + +.PHONY: vs2017_intel +vs2017_intel: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2017 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + +.PHONY: vs2017_xp +vs2017_xp: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=vs2017-xp vs2017 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + +.PHONY: vs2017_uwp +vs2017_uwp: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --MODERN_WIN_API=1 vs2015 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + +.PHONY: vs2017_fastbuild +vs2017_fastbuild: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2017-fastbuild +ifdef FASTBUILD + $(SILENT) fbuild.exe -config $(PROJECTDIR_WIN)/vs2017-fastbuild/ftbuild.bff $(FASTBUILD_PARAMS) +endif + #------------------------------------------------- # android-ndk #------------------------------------------------- -- cgit v1.2.3