diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-06-02 22:59:56 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-06-02 22:59:56 +0300 |
| commit | 815b1f24fa298784d9204b9248bc69ceb2b3d762 (patch) | |
| tree | 588894743c41097540b3ac2d11b0338474b30024 /build_files/build_environment/windows | |
| parent | 2ef695fabf33e227d742aa5adf39490a2a87f58b (diff) | |
build_environment: support for msvc2017 and newer cmake.
-expanded build_deps.cmd with 2017 support, it can't locate msvc2017 so needs to be run from developer prompt.
-Newer cmake was unhappy with openal's cmakelists.txt
-collada has warning as error on and errored out on new msvc2017 warnings.
Diffstat (limited to 'build_files/build_environment/windows')
| -rw-r--r-- | build_files/build_environment/windows/build_deps.cmd | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/build_files/build_environment/windows/build_deps.cmd b/build_files/build_environment/windows/build_deps.cmd index 96280014df2..500e689cdc8 100644 --- a/build_files/build_environment/windows/build_deps.cmd +++ b/build_files/build_environment/windows/build_deps.cmd @@ -14,10 +14,18 @@ if NOT "%1" == "" ( set BuildDir=VS14 goto par2 ) + if "%1" == "2017" ( + echo "Building for VS2017" + set VSVER=15.0 + set VSVER_SHORT=15 + set BuildDir=VS15 + goto par2 + ) + ) :usage -Echo Usage build_deps 2013/2015 x64/x86 +Echo Usage build_deps 2013/2015/2017 x64/x86 goto exit :par2 if NOT "%2" == "" ( @@ -31,6 +39,10 @@ if NOT "%2" == "" ( if "%1" == "2015" ( set CMAKE_BUILDER=Visual Studio 14 2015 ) + if "%1" == "2017" ( + set CMAKE_BUILDER=Visual Studio 15 2017 + ) + goto start ) if "%2" == "x64" ( @@ -43,6 +55,10 @@ if NOT "%2" == "" ( if "%1" == "2015" ( set CMAKE_BUILDER=Visual Studio 14 2015 Win64 ) + if "%1" == "2017" ( + set CMAKE_BUILDER=Visual Studio 15 2017 Win64 + ) + goto start ) ) |