diff options
| author | Tanner Gooding <tagoo@outlook.com> | 2019-02-11 23:19:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 23:19:44 -0800 |
| commit | f0770609f8cdbeba019b35af48b70840f33bd479 (patch) | |
| tree | 3415d53fe0cf130ca844520d614153e900c3b0bd /src/pal | |
| parent | 1c28b497ff2d49141f6a63e3f293095161e40d00 (diff) | |
| download | coreclr-f0770609f8cdbeba019b35af48b70840f33bd479.tar.gz coreclr-f0770609f8cdbeba019b35af48b70840f33bd479.tar.bz2 coreclr-f0770609f8cdbeba019b35af48b70840f33bd479.zip | |
Support building with VS2019 Preview (#22525)
* Support building with VS2019 Preview
* Fixing gen-buildsys-win to only set the architecture for the VS generator
* Refactoring Dev11/147911/fpcw.cpp so that it compiles under VS2019
* Removing the remaining traces of VS2015 build support
Diffstat (limited to 'src/pal')
| -rw-r--r-- | src/pal/tools/gen-buildsys-win.bat | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/pal/tools/gen-buildsys-win.bat b/src/pal/tools/gen-buildsys-win.bat index f542e994e7..87b0dee77c 100644 --- a/src/pal/tools/gen-buildsys-win.bat +++ b/src/pal/tools/gen-buildsys-win.bat @@ -19,13 +19,17 @@ set __SourceDir=%1 set __VSVersion=%2 set __Arch=%3 set __CmakeGenerator=Visual Studio -if /i "%__VSVersion%" == "vs2017" (set __CmakeGenerator=%__CmakeGenerator% 15 2017) -if /i "%__VSVersion%" == "vs2015" (set __CmakeGenerator=%__CmakeGenerator% 14 2015) -if /i "%__Arch%" == "x64" (set __CmakeGenerator=%__CmakeGenerator% Win64) -if /i "%__Arch%" == "arm" (set __CmakeGenerator=%__CmakeGenerator% ARM) -if /i "%__Arch%" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A ARM64) -if /i "%__NMakeMakefiles%" == "1" (set __CmakeGenerator=NMake Makefiles) +if /i "%__NMakeMakefiles%" == "1" ( + set __CmakeGenerator=NMake Makefiles +) else ( + if /i "%__VSVersion%" == "vs2019" (set __CmakeGenerator=%__CmakeGenerator% 16 2019) + if /i "%__VSVersion%" == "vs2017" (set __CmakeGenerator=%__CmakeGenerator% 15 2017) + + if /i "%__Arch%" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64) + if /i "%__Arch%" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A ARM) + if /i "%__Arch%" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A ARM64) +) :loop if [%4] == [] goto end_loop @@ -48,7 +52,7 @@ GOTO :DONE echo "Usage..." echo "gen-buildsys-win.bat <path to top level CMakeLists.txt> <VSVersion>" echo "Specify the path to the top level CMake file - <ProjectK>/src/NDP" - echo "Specify the VSVersion to be used - VS2015 or VS2017" + echo "Specify the VSVersion to be used - VS2017 or VS2019" EXIT /B 1 :DONE |