From d5c257536016f6a98ddb9ed1cbc2411c7a2edca1 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sun, 13 Nov 2022 14:18:22 -0700
Subject: [PATCH] ci: try alternate way of requesting 8.1 sdk

---
 .github/workflows/cmake.yml | 2 ++
 appveyor.yml                | 1 +
 build-appveyor.ps1          | 2 +-
 build-windows.ps1           | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index eee59473..e1905aff 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -26,6 +26,8 @@ jobs:
     - name: Setup MSVC environment
       if: runner.os == 'Windows' 
       uses: ilammy/msvc-dev-cmd@v1
+      with:
+        sdk: 8.1 # maintain Windows 8.1 support
 
     - name: Linux Build
       if: runner.os == 'Linux'
diff --git a/appveyor.yml b/appveyor.yml
index b181162b..810bbf3e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,7 @@ install:
 - ps: 7z x embree64.zip -oc:\
 - ps: Invoke-WebRequest 'https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-win.zip' -OutFile 'tbb.zip'
 - ps: 7z x tbb.zip -oc:\
+- cmd: call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" x64 8.1
 build_script:
 - cmd: powershell .\build-appveyor.ps1
 artifacts:
diff --git a/build-appveyor.ps1 b/build-appveyor.ps1
index 4bba61d3..b76e1b7d 100644
--- a/build-appveyor.ps1
+++ b/build-appveyor.ps1
@@ -18,7 +18,7 @@ mkdir cmakebuild
 
 cd cmakebuild
 
-cmake .. -T v143 -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_SYSTEM_VERSION="8.1" -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
+cmake .. -T v143 -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
 
 $cmakePlatform = "x64"
 
diff --git a/build-windows.ps1 b/build-windows.ps1
index 6909d9c7..ecc6d24b 100644
--- a/build-windows.ps1
+++ b/build-windows.ps1
@@ -20,7 +20,7 @@ choco install ninja
 mkdir build-windows
 cd build-windows
 
-cmake .. -GNinja -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_VERSION="8.1"
+cmake .. -GNinja -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_BUILD_TYPE=Release
 
 ninja
 if ( $? -eq $false ) {