diff options
| author | thexai <58434170+thexai@users.noreply.github.com> | 2023-04-10 10:48:54 +0200 |
|---|---|---|
| committer | thexai <58434170+thexai@users.noreply.github.com> | 2023-04-10 17:44:41 +0200 |
| commit | d248866ec41a943f2554e4470615774ea89e250c (patch) | |
| tree | e11f10caec359a3db58a6dfb3524bdb94791d551 /tools | |
| parent | c5a2f90fe5f223dcbe2c210a74249b1dbac3cacf (diff) | |
[UWP][Build] Remove requirement of specific Windows SDK version
Let's CMake choose latest SDK installed at time of build.
Is already like this for Windows x64 desktop.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/windows/arm-uwp/BuildSetup.bat | 2 | ||||
| -rw-r--r-- | tools/buildsteps/windows/vswhere.bat | 1 | ||||
| -rw-r--r-- | tools/buildsteps/windows/win32-uwp/BuildSetup.bat | 2 | ||||
| -rw-r--r-- | tools/buildsteps/windows/x64-uwp/BuildSetup.bat | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat index 8fd6e03de1..5dc8d8d5ea 100644 --- a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat +++ b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat @@ -13,7 +13,7 @@ SET cmakeGenerator=Visual Studio %vsver% SET cmakeArch=ARM SET TARGET_ARCHITECTURE=arm SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%-uwp -SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% +SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 CALL BuildSetup.bat %* POPD diff --git a/tools/buildsteps/windows/vswhere.bat b/tools/buildsteps/windows/vswhere.bat index b8c60b9e34..1959c20722 100644 --- a/tools/buildsteps/windows/vswhere.bat +++ b/tools/buildsteps/windows/vswhere.bat @@ -38,7 +38,6 @@ IF "%arch%"=="x86" ( ) IF "%vcstore%"=="store" ( - SET sdkver=10.0.18362.0 SET toolsdir="win10-%toolsdir%" ) diff --git a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat index 5ddf234b57..7b9d995b6a 100644 --- a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat +++ b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat @@ -12,7 +12,7 @@ SET cmakeGenerator=Visual Studio %vsver% SET cmakeArch=Win32 SET TARGET_ARCHITECTURE=x86 SET TARGET_PLATFORM=win32-uwp -SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% +SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 CALL BuildSetup.bat %* POPD diff --git a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat index 8144248dd0..aab9fe2d50 100644 --- a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat +++ b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat @@ -12,7 +12,7 @@ SET cmakeGenerator=Visual Studio %vsver% SET cmakeArch=x64 SET TARGET_ARCHITECTURE=x64 SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%-uwp -SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% +SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 CALL BuildSetup.bat %* POPD |