From dc9d337b79e1dc92e8fefddef0b442d7776910af Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Tue, 14 May 2024 00:06:31 -0400 Subject: [PATCH] Fix build with Xcode 15.4 by bumping MoltenVK version to 1.2.8 --- Externals/MoltenVK/CMakeLists.txt | 4 ++-- Source/Core/DolphinQt/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Externals/MoltenVK/CMakeLists.txt b/Externals/MoltenVK/CMakeLists.txt index ae8fa1c474..d4e92ea0dc 100644 --- a/Externals/MoltenVK/CMakeLists.txt +++ b/Externals/MoltenVK/CMakeLists.txt @@ -1,6 +1,6 @@ include(ExternalProject) -set(MOLTENVK_VERSION "v1.2.7") +set(MOLTENVK_VERSION "v1.2.8") ExternalProject_Add(MoltenVK GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git @@ -12,7 +12,7 @@ ExternalProject_Add(MoltenVK BUILD_COMMAND make -C macos BUILD_IN_SOURCE ON - BUILD_BYPRODUCTS /Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib + BUILD_BYPRODUCTS /Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib INSTALL_COMMAND "" diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index dc946b5b50..8085b49a60 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -614,8 +614,8 @@ if(APPLE) if(USE_BUNDLED_MOLTENVK) add_dependencies(dolphin-emu MoltenVK) ExternalProject_Get_Property(MoltenVK SOURCE_DIR) - target_sources(dolphin-emu PRIVATE "${SOURCE_DIR}/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib") - set_source_files_properties("${SOURCE_DIR}/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks GENERATED ON) + target_sources(dolphin-emu PRIVATE "${SOURCE_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib") + set_source_files_properties("${SOURCE_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks GENERATED ON) else() find_file(MOLTENVK_DYLIB NAMES libMoltenVK.dylib PATH_SUFFIXES lib) if(NOT MOLTENVK_DYLIB)