diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-10-01 21:36:11 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-10-01 21:36:11 +0300 |
| commit | 34bd23dbb71b2f8bfc696acf5107650bd750364d (patch) | |
| tree | 038dc3019c13624eb83918f6f0abd1242137fa5f /build_files/windows | |
| parent | c06350d8a79fa1bfeda0772d683cb91218ea3cb7 (diff) | |
MSVC: Support Building clang+ninja+VS2019
1) Clang was given the wrong VS version to emulate when used in
combination with VS2019 causing build issues.
2) The erroneous supplied parameter `-std::c++11`caused CMake to
fail running its compiler detection scripts.
Diffstat (limited to 'build_files/windows')
| -rw-r--r-- | build_files/windows/configure_ninja.cmd | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build_files/windows/configure_ninja.cmd b/build_files/windows/configure_ninja.cmd index 995d8d56fa8..8f766e855a6 100644 --- a/build_files/windows/configure_ninja.cmd +++ b/build_files/windows/configure_ninja.cmd @@ -30,9 +30,15 @@ set LLVM_DIR= :DetectionComplete set CC=%LLVM_DIR%\bin\clang-cl set CXX=%LLVM_DIR%\bin\clang-cl - rem build and tested against 2017 15.7 - set CFLAGS=-m64 -fmsc-version=1914 - set CXXFLAGS=-m64 -fmsc-version=1914 + if "%BUILD_VS_YEAR%" == "2019" ( + rem build and tested against 2019 16.2 + set CFLAGS=-m64 -fmsc-version=1922 + set CXXFLAGS=-m64 -fmsc-version=1922 + ) else ( + rem build and tested against 2017 15.7 + set CFLAGS=-m64 -fmsc-version=1914 + set CXXFLAGS=-m64 -fmsc-version=1914 + ) if "%WITH_ASAN%"=="1" ( set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_COMPILER_ASAN=On ) |