[tools/windows] fix Windows on ARM installs for vulkan (#3201)
while we dont support MSVC on ARM64 yet, one day we may, and when that day comes someone will be annoyed their vulkan sdk won't install properly Signed-off-by: lizzie lizzie@eden-emu.dev Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3201 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: DraVee <dravee@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
parent
9b1f6801a5
commit
8907523ee4
|
|
@ -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-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||||
|
|
@ -14,10 +14,17 @@ try {
|
||||||
Exit 1
|
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"
|
$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"
|
||||||
$ExeFile = "vulkansdk-windows-X64-$VulkanSDKVer.exe"
|
$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"
|
$Destination = "./$ExeFile"
|
||||||
|
|
||||||
# Check if Vulkan SDK is already installed
|
# Check if Vulkan SDK is already installed
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,19 @@
|
||||||
#!/usr/bin/sh
|
#!/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
|
# 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}"
|
: "${VULKAN_ROOT:=C:/VulkanSDK/$VULKAN_SDK_VER}"
|
||||||
EXE_FILE="vulkansdk-windows-X64-$VULKAN_SDK_VER.exe"
|
VULKAN_SDK_ARCH=X64
|
||||||
URI="https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/windows/$EXE_FILE"
|
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")
|
VULKAN_ROOT_UNIX=$(cygpath -u "$VULKAN_ROOT")
|
||||||
|
|
||||||
# Check if Vulkan SDK is already installed
|
# Check if Vulkan SDK is already installed
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue