olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "ci: try alternate way of requesting 8.1 sdk" 

This reverts commit d5c2575360.
This commit is contained in:
Eric Wasylishen 2022-11-13 15:06:40 -07:00
parent d5c2575360
commit a7645c3396
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cmake.yml vendored
View File

@ -26,8 +26,6 @@ jobs:
- name: Setup MSVC environment - name: Setup MSVC environment
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
with:
sdk: 8.1 # maintain Windows 8.1 support
- name: Linux Build - name: Linux Build
if: runner.os == 'Linux' if: runner.os == 'Linux'

1
appveyor.yml
View File

@ -9,7 +9,6 @@ install:
- ps: 7z x embree64.zip -oc:\ - 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: 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:\ - 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: build_script:
- cmd: powershell .\build-appveyor.ps1 - cmd: powershell .\build-appveyor.ps1
artifacts: artifacts:

2
build-appveyor.ps1
View File

@ -18,7 +18,7 @@ mkdir cmakebuild
cd 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 -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 -DCMAKE_SYSTEM_VERSION="8.1" -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
$cmakePlatform = "x64" $cmakePlatform = "x64"

2
build-windows.ps1
View File

@ -20,7 +20,7 @@ choco install ninja
mkdir build-windows mkdir build-windows
cd 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 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"
ninja ninja
if ( $? -eq $false ) { if ( $? -eq $false ) {