piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build with Xcode 15.4 by bumping MoltenVK version to 1.2.8

Browse Source
This commit is contained in:
Eric Warmenhoven 2024-05-14 00:06:31 -04:00
parent 7ba539d796
commit dc9d337b79
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Externals/MoltenVK/CMakeLists.txt vendored
View File

@ -1,6 +1,6 @@
include(ExternalProject) include(ExternalProject)
set(MOLTENVK_VERSION "v1.2.7") set(MOLTENVK_VERSION "v1.2.8")
ExternalProject_Add(MoltenVK ExternalProject_Add(MoltenVK
GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
@ -12,7 +12,7 @@ ExternalProject_Add(MoltenVK
BUILD_COMMAND make -C <SOURCE_DIR> macos BUILD_COMMAND make -C <SOURCE_DIR> macos
BUILD_IN_SOURCE ON BUILD_IN_SOURCE ON
BUILD_BYPRODUCTS <SOURCE_DIR>/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib BUILD_BYPRODUCTS <SOURCE_DIR>/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib
INSTALL_COMMAND "" INSTALL_COMMAND ""

4
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -614,8 +614,8 @@ if(APPLE)
if(USE_BUNDLED_MOLTENVK) if(USE_BUNDLED_MOLTENVK)
add_dependencies(dolphin-emu MoltenVK) add_dependencies(dolphin-emu MoltenVK)
ExternalProject_Get_Property(MoltenVK SOURCE_DIR) ExternalProject_Get_Property(MoltenVK SOURCE_DIR)
target_sources(dolphin-emu PRIVATE "${SOURCE_DIR}/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib") target_sources(dolphin-emu PRIVATE "${SOURCE_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib")
set_source_files_properties("${SOURCE_DIR}/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks GENERATED ON) set_source_files_properties("${SOURCE_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks GENERATED ON)
else() else()
find_file(MOLTENVK_DYLIB NAMES libMoltenVK.dylib PATH_SUFFIXES lib) find_file(MOLTENVK_DYLIB NAMES libMoltenVK.dylib PATH_SUFFIXES lib)
if(NOT MOLTENVK_DYLIB) if(NOT MOLTENVK_DYLIB)