From 79bb5f079ce39a70ee2df3441cf779cabe1b97b3 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 5 Aug 2024 01:12:17 +1000 Subject: [PATCH] GPUDevice: Fix SPIRV-Cross load error on Mac --- scripts/appimage/make-appimage.sh | 2 +- src/util/gpu_device.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/appimage/make-appimage.sh b/scripts/appimage/make-appimage.sh index b0561f73c..4fb9137c9 100755 --- a/scripts/appimage/make-appimage.sh +++ b/scripts/appimage/make-appimage.sh @@ -58,7 +58,7 @@ STRIP=strip declare -a MANUAL_LIBS=( "libdiscord-rpc.so" "libshaderc_shared.so" - "libspirv-cross-c-shared.so.0.61.0" + "libspirv-cross-c-shared.so.0" ) declare -a MANUAL_QT_LIBS=( diff --git a/src/util/gpu_device.cpp b/src/util/gpu_device.cpp index 66b163c69..72bceb963 100644 --- a/src/util/gpu_device.cpp +++ b/src/util/gpu_device.cpp @@ -1321,8 +1321,7 @@ bool dyn_libs::OpenSpirvCross(Error* error) // SPVC's build on Windows doesn't spit out a versioned DLL. const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared"); #else - const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared", SPVC_C_API_VERSION_MAJOR, - SPVC_C_API_VERSION_MINOR, SPVC_C_API_VERSION_PATCH); + const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared", SPVC_C_API_VERSION_MAJOR); #endif if (!s_spirv_cross_library.Open(libname.c_str(), error)) {