diff options
author | 2019-10-02 06:30:05 +0200 | |
---|---|---|
committer | 2019-10-02 14:30:05 +1000 | |
commit | fc31772d537941104ca810fbc3b5a13584c88835 (patch) | |
tree | c0c1e106a5d687074d2b775e64c0fab4de2ca4a9 /makefile | |
parent | 5707a77cfe11eba057de128b6844a671753ccc3d (diff) |
vs2019 fixes, initial clang-cl support (#5698)
* Add initial clangcl support
* Fix uwp builds' vs version typos
* Add missing vs2019 toolchain.lua bits
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1179,7 +1179,7 @@ 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 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2015 + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2017 ifdef MSBUILD $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2017-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) endif @@ -1202,6 +1202,13 @@ ifdef MSBUILD $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) endif +.PHONY: vs2019_clang +vs2019_clang: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=clangcl vs2019 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-clang/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + .PHONY: vs2019_intel vs2019_intel: generate $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2019 @@ -1211,7 +1218,7 @@ endif .PHONY: vs2019_uwp vs2019_uwp: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2015 + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2019 ifdef MSBUILD $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) endif |