VERY experimental Nintendo Switch 2 emulator
C++
[tools/windows] fix Windows on ARM installs for vulkan (#3201)
lizzie8907523ee4e5
diff --git a/tools/windows/install-vulkan-sdk.ps1 b/tools/windows/install-vulkan-sdk.ps1index ac26d62766..1b93e12a83 100755--- a/tools/windows/install-vulkan-sdk.ps1+++ b/tools/windows/install-vulkan-sdk.ps1@@ -1,4 +1,4 @@-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project# SPDX-License-Identifier: GPL-3.0-or-later# SPDX-FileCopyrightText: 2023 yuzu Emulator Project@@ -14,10 +14,17 @@ try {Exit 1}-$VulkanSDKVer = "1.4.335.0"+$VulkanSDKVer = "1.4.341.1"+if ((Get-WmiObject -Class Win32_ComputerSystem).SystemType -match '(x64)' -eq "True") {+ $VulkanSDKArch = "X64"+ $VulkanSDKOs = "windows"+} else {+ $VulkanSDKArch = "ARM64"+ $VulkanSDKOs = "warm"+}$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"-$ExeFile = "vulkansdk-windows-X64-$VulkanSDKVer.exe"-$Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/windows/$ExeFile"+$ExeFile = "vulkansdk-windows-$VulkanSDKArch-$VulkanSDKVer.exe"+$Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/$VulkanSDKOs/$ExeFile"$Destination = "./$ExeFile"# Check if Vulkan SDK is already installeddiff --git a/tools/windows/install-vulkan-sdk.sh b/tools/windows/install-vulkan-sdk.shindex 9cc3426d4a..0f136748cf 100644--- a/tools/windows/install-vulkan-sdk.sh+++ b/tools/windows/install-vulkan-sdk.sh@@ -1,11 +1,19 @@#!/usr/bin/sh-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project# SPDX-License-Identifier: GPL-3.0-or-later-: "${VULKAN_SDK_VER:=1.4.335.0}"+: "${VULKAN_SDK_VER:=1.4.341.1}": "${VULKAN_ROOT:=C:/VulkanSDK/$VULKAN_SDK_VER}"-EXE_FILE="vulkansdk-windows-X64-$VULKAN_SDK_VER.exe"-URI="https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/windows/$EXE_FILE"+VULKAN_SDK_ARCH=X64+VULKAN_SDK_OS=windows+case "$(uname)" in+ *ARM64*)+ VULKAN_SDK_ARCH=ARM64+ VULKAN_SDK_OS=warm+ ;;+esac+EXE_FILE="vulkansdk-windows-$VULKAN_SDK_ARCH-$VULKAN_SDK_VER.exe"+URI="https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/$VULKAN_SDK_OS/$EXE_FILE"VULKAN_ROOT_UNIX=$(cygpath -u "$VULKAN_ROOT")# Check if Vulkan SDK is already installed