From ce1a673ed2f75cc0302886efa3d95f92d15a372a Mon Sep 17 00:00:00 2001 From: lizzie Date: Fri, 30 Jan 2026 10:51:20 +0000 Subject: [PATCH] fuckery but triple --- tools/windows/install-vulkan-sdk.ps1 | 6 ++++-- tools/windows/install-vulkan-sdk.sh | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/windows/install-vulkan-sdk.ps1 b/tools/windows/install-vulkan-sdk.ps1 index da7153aaed..5eddcb9f78 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 @@ -17,12 +17,14 @@ try { $VulkanSDKVer = "1.4.335.0" 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-$VulkanSDKArch-$VulkanSDKVer.exe" -$Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/windows/$ExeFile" +$Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/$VulkanSDKOs/$ExeFile" $Destination = "./$ExeFile" # Check if Vulkan SDK is already installed diff --git a/tools/windows/install-vulkan-sdk.sh b/tools/windows/install-vulkan-sdk.sh index f874641cd3..d8a70f094f 100644 --- a/tools/windows/install-vulkan-sdk.sh +++ b/tools/windows/install-vulkan-sdk.sh @@ -1,15 +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_ROOT:=C:/VulkanSDK/$VULKAN_SDK_VER}" VULKAN_SDK_ARCH=X64 +VULKAN_SDK_OS=windows case "$(uname)" in - *ARM64*) VULKAN_SDK_ARCH=ARM64 ;; + *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/windows/$EXE_FILE" +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