diff --git a/CMakeLists.txt b/CMakeLists.txt index fcb3fc26b4..26d38fd55c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ if(APPLE) option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF) # Enable adhoc code signing by default (otherwise makefile builds on ARM will not work) option(MACOS_CODE_SIGNING "Enable codesigning" ON) - option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON) + option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" OFF) # slippi change: turned off to use in tree dylib. turn on if we need to generate an updated dylib set(MACOS_CODE_SIGNING_IDENTITY "-" CACHE STRING "The identity used for codesigning.") set(MACOS_CODE_SIGNING_IDENTITY_UPDATER "-" CACHE STRING "The identity used for codesigning, for the updater.") endif() diff --git a/Externals/MoltenVK/libMoltenVK.dylib b/Externals/MoltenVK/libMoltenVK.dylib new file mode 100644 index 0000000000..0c9c6e69d9 Binary files /dev/null and b/Externals/MoltenVK/libMoltenVK.dylib differ diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 53b155bbd2..df4a60366d 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -622,7 +622,7 @@ if(APPLE) 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) else() - find_file(MOLTENVK_DYLIB NAMES libMoltenVK.dylib PATH_SUFFIXES lib) + find_file(MOLTENVK_DYLIB NAMES libMoltenVK.dylib PATH_SUFFIXES lib PATHS "${CMAKE_SOURCE_DIR}/Externals/MoltenVK/") # slippi change: added in tree path if(NOT MOLTENVK_DYLIB) message(FATAL_ERROR "Couldn't find libMoltenVK.dylib. Enable USE_BUNDLED_MOLTENVK?") endif()