eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 59 Projects 1 Releases Packages Wiki Activity Actions

fix
Some checks failed
eden-license / license-header (pull_request) Failing after 25s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-10-07 19:50:39 -04:00
parent 993887dd88
commit 337eafb2e0
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
externals/CMakeLists.txt vendored
View file

@ -416,25 +416,26 @@ if (APPLE)
find_library(IOSURFACE_LIBRARY IOSurface REQUIRED) find_library(IOSURFACE_LIBRARY IOSurface REQUIRED)
find_library(QUARTZCORE_LIBRARY QuartzCore REQUIRED) find_library(QUARTZCORE_LIBRARY QuartzCore REQUIRED)
add_library(MoltenVK::MoltenVK STATIC IMPORTED) add_library(MoltenVK::MoltenVK STATIC IMPORTED GLOBAL)
set_target_properties(MoltenVK::MoltenVK PROPERTIES set_target_properties(MoltenVK::MoltenVK PROPERTIES
IMPORTED_LOCATION "${MVK_STATIC}" IMPORTED_LOCATION "${MVK_STATIC}"
) )
target_link_libraries(MoltenVK::MoltenVK INTERFACE ${IOSURFACE_LIBRARY} ${QUARTZCORE_LIBRARY}) target_link_libraries(MoltenVK::MoltenVK INTERFACE ${IOSURFACE_LIBRARY} ${QUARTZCORE_LIBRARY})
else() else()
add_library(MoltenVK::MoltenVK SHARED IMPORTED) add_library(MoltenVK::MoltenVK SHARED IMPORTED GLOBAL)
set_target_properties(MoltenVK::MoltenVK PROPERTIES set_target_properties(MoltenVK::MoltenVK PROPERTIES
IMPORTED_LOCATION "${MVK_DYLIB}" IMPORTED_LOCATION "${MVK_DYLIB}"
) )
endif() endif()
target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK)
else() else()
message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.") message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.")
set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks
XCODE_FILE_ATTRIBUTES "CodeSignOnCopy") XCODE_FILE_ATTRIBUTES "CodeSignOnCopy")
target_sources(yuzu ${MOLTENVK_LIBRARY}) add_library(MoltenVK::MoltenVK SHARED IMPORTED GLOBAL)
set_target_properties(MoltenVK::MoltenVK PROPERTIES
IMPORTED_LOCATION "${MOLTENVK_LIBRARY}"
)
endif() endif()
endif() endif()

14
src/yuzu/CMakeLists.txt
View file

@ -366,19 +366,7 @@ if (APPLE)
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE) set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
find_library(MOLTENVK_LIBRARY MoltenVK) target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK)
if (NOT MOLTENVK_LIBRARY OR YUZU_USE_BUNDLED_MOLTENVK)
set(MOLTENVK_PLATFORM "macos")
set(MOLTENVK_VERSION "v1.4.0")
download_moltenvk(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})
target_link_libraries(yuzu PRIVATE MoltenVK::MoltenVK)
else()
message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.")
set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks
XCODE_FILE_ATTRIBUTES "CodeSignOnCopy")
target_link_libraries(yuzu PRIVATE ${MOLTENVK_LIBRARY})
endif()
endif() endif()
if(WIN32) if(WIN32)