VERY experimental Nintendo Switch 2 emulator
C++
ci: Download and install Vulkan SDK directly from LunarG
Morphc4cdc8c51c6d
diff --git a/.ci/scripts/windows/install-vulkan-sdk.ps1 b/.ci/scripts/windows/install-vulkan-sdk.ps1new file mode 100644index 0000000000..778a2c2ff3--- /dev/null+++ b/.ci/scripts/windows/install-vulkan-sdk.ps1@@ -0,0 +1,33 @@+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project+# SPDX-License-Identifier: GPL-3.0-or-later++$ErrorActionPreference = "Stop"++$VulkanSDKVer = "1.3.243.0"+$ExeFile = "VulkanSDK-$VulkanSDKVer-Installer.exe"+$Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/windows/$ExeFile"+$Destination = "./$ExeFile"++echo "Downloading Vulkan SDK $VulkanSDKVer from $Uri"+$WebClient = New-Object System.Net.WebClient+$WebClient.DownloadFile($Uri, $Destination)+echo "Finished downloading $ExeFile"++$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"+$Arguments = "--root `"$VULKAN_SDK`" --accept-licenses --default-answer --confirm-command install"++echo "Installing Vulkan SDK $VulkanSDKVer"+$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -Wait -ArgumentList $Arguments+$ExitCode = $InstallProcess.ExitCode++if ($ExitCode -ne 0) {+ echo "Error installing Vulkan SDK $VulkanSDKVer (Error: $ExitCode)"+ Exit $ExitCode+}++echo "Finished installing Vulkan SDK $VulkanSDKVer"++if ("$env:GITHUB_ACTIONS" -eq "true") {+ echo "VULKAN_SDK=$VULKAN_SDK" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append+ echo "$VULKAN_SDK/Bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append+}diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.ymlindex ceb7e0c323..d069fa9c3f 100644--- a/.ci/templates/build-msvc.yml+++ b/.ci/templates/build-msvc.yml@@ -7,9 +7,12 @@ parameters:version: ''steps:-- script: choco install vulkan-sdk- displayName: 'Install vulkan-sdk'-- script: refreshenv && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DYUZU_ENABLE_LTO=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd ..+- task: Powershell@2+ displayName: 'Install Vulkan SDK'+ inputs:+ targetType: 'filePath'+ filePath: './.ci/scripts/windows/install-vulkan-sdk.ps1'+- script: refreshenv && glslangValidator --version && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DYUZU_ENABLE_LTO=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd ..displayName: 'Configure CMake'- task: MSBuild@1displayName: 'Build'diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.ymlindex b5d3381998..19c3a4089d 100644--- a/.github/workflows/verify.yml+++ b/.github/workflows/verify.yml@@ -84,13 +84,16 @@ jobs:# due to how chocolatey works, only cmd.exe is supported hereshell: cmdrun: |- choco install vulkan-sdk wget+ choco install wgetcall refreshenvwget https://github.com/mbitsnbites/buildcache/releases/download/v0.27.6/buildcache-windows.zip7z x buildcache-windows.zipcopy buildcache\bin\buildcache.exe C:\ProgramData\chocolatey\binrmdir buildcacheecho %PATH% >> %GITHUB_PATH%+ - name: Install Vulkan SDK+ shell: pwsh+ run: .\.ci\scripts\windows\install-vulkan-sdk.ps1- name: Set up MSVCuses: ilammy/msvc-dev-cmd@v1- uses: actions/checkout@v3