Merge pull request #317 from mortend/vs2019

More Visual Studio 2019
fuse-open · Apr 18, 2020 · 559e08e · 559e08e
2 parents 016f0fd + 41c4fd2
commit 559e08e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/docs/build-instructions.md b/docs/build-instructions.md
@@ -12,7 +12,7 @@ Uno is built using the command-line on Linux, macOS or Windows – or [from insi
 Our cross-platform build scripts are written in `bash`, and `make` is a convenient way to invoke the different build tasks.
 Bash is included in [Git for Windows](https://git-scm.com/downloads).
 
-On Windows, we need [vswhere] to locate your Visual Studio 2017 installation. Please make sure we can find `vswhere` in
+On Windows, we need [vswhere] to locate your Visual Studio installation. Please make sure we can find `vswhere` in
 `%PATH%` or at `%PROGRAMFILES(x86)%\Microsoft Visual Studio\Installer`.
 
 [vswhere]: https://github.com/Microsoft/vswhere

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -65,7 +65,7 @@ iOS.DeveloperTeam: ABCD012345
 To support building native apps, we need [CMake](https://cmake.org/) and C++ compilers.
 
 - **macOS:** Xcode with command line tools
-- **Windows:** Visual Studio 2017
+- **Windows:** Visual Studio 2019
 
 ## Node.js
 

diff --git a/lib/UnoCore/Targets/Native/Native.uxl b/lib/UnoCore/Targets/Native/Native.uxl
@@ -33,7 +33,6 @@
     <Set Condition="!WIN32 && !LIBRARY" Product="@(BinaryDirectory)/@(Project.Name)" />
     <Set Condition="!WIN32 && LIBRARY" Product="@(BinaryDirectory)/lib@(Project.Name).@(MAC:Defined:Test('dylib', 'so'))" />
     <Set Condition="WIN32" Product="@(BinaryDirectory)/@(Project.Name).@(LIBRARY:Defined:Test('dll', 'exe'))" />
-    <Set Condition="WIN32" CMake.Generator="Visual Studio 16 2019" />
 
     <Set Commands.Build="@(WIN32:Defined:Test('build.bat', 'bash build.sh'))" />
     <Set Commands.Run="@(WIN32:Defined:Test('run.bat', 'bash run.sh'))" />

diff --git a/lib/UnoCore/Targets/Native/build.bat b/lib/UnoCore/Targets/Native/build.bat
@@ -15,7 +15,7 @@ if not %ERRORLEVEL% == 0 (
 
 pushd "%~dp0"
 
-cmake -G"@(CMake.Generator)" .
+cmake -G"Visual Studio 16 2019" .
 if not %ERRORLEVEL% == 0 (popd && exit /b %ERRORLEVEL%)
 
 cmake --build . -- /p:Configuration=@(Native.Configuration) /m

diff --git a/lib/UnoCore/Targets/Native/run.bat b/lib/UnoCore/Targets/Native/run.bat
@@ -17,11 +17,11 @@ if "%1" == "debug" (
 
     pushd "%~dp0"
 
-    cmake -G"@(CMake.Generator)" .
+    cmake -G"Visual Studio 16 2019" .
     if not %ERRORLEVEL% == 0 (popd && exit /b %ERRORLEVEL%)
 
-    echo Opening Visual Studio 2017
-    @(Uno) open -a"Visual Studio 2017" -t"@(Project.Name) - Microsoft Visual Studio" "@(Project.Name).sln"
+    echo Opening Visual Studio 2019
+    @(Uno) open -a"Visual Studio 2019" -t"@(Project.Name) - Microsoft Visual Studio" "@(Project.Name).sln"
     popd && exit /b %ERRORLEVEL%
 )