mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 04:38:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix macos build

Browse source
This commit is contained in:
administrator 2023-05-26 16:29:26 -04:00
commit a96b67f50d
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -28,7 +28,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15.0" CACHE STRING "")
set(CMAKE_USER_MAKE_RULES_OVERRIDE "CMake/FlagsOverride.cmake") set(CMAKE_USER_MAKE_RULES_OVERRIDE "CMake/FlagsOverride.cmake")
project(dolphin-emu) project(dolphin-mpn)
if (MSVC) if (MSVC)
if (POLICY CMP0117) if (POLICY CMP0117)
@ -1056,14 +1056,14 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
install(FILES Data/dolphin-mpn.desktop install(FILES Data/dolphin-mpn.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
# Install manpages # Install manpages
install(FILES Data/dolphin-emu.6 install(FILES Data/dolphin-mpn.6
DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
install(FILES Data/dolphin-emu-nogui.6 install(FILES Data/dolphin-mpn-nogui.6
DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
endif() endif()
# packaging information # packaging information
set(CPACK_PACKAGE_NAME "dolphin-emu") set(CPACK_PACKAGE_NAME "dolphin-mpn")
set(CPACK_PACKAGE_VENDOR "Dolphin Team") set(CPACK_PACKAGE_VENDOR "Dolphin Team")
set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR})

BIN
Data/Dolphin.icns
View file

Binary file not shown.

2
Externals/VulkanMemoryAllocator vendored

@ -1 +1 @@
Subproject commit 498e20dfd1343d99b9115201034bb0219801cdec Subproject commit c351692490513cdb0e5a2c925aaf7ea4a9b672f4

8
Source/Core/DolphinQt/CMakeLists.txt
View file

@ -402,8 +402,8 @@ if (MSVC)
target_compile_definitions(dolphin-mpn PRIVATE _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING) target_compile_definitions(dolphin-mpn PRIVATE _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING)
# Qt6 requires RTTI # Qt6 requires RTTI
remove_cxx_flag_from_target(dolphin-emu "/GR-") remove_cxx_flag_from_target(dolphin-mpn "/GR-")
target_compile_options(dolphin-emu PRIVATE "/GR") target_compile_options(dolphin-mpn PRIVATE "/GR")
endif() endif()
if(WIN32) if(WIN32)
@ -546,11 +546,11 @@ if(APPLE)
# Copy Qt plugins into the bundle # Copy Qt plugins into the bundle
get_target_property(qtcocoa_location Qt6::QCocoaIntegrationPlugin LOCATION) get_target_property(qtcocoa_location Qt6::QCocoaIntegrationPlugin LOCATION)
target_sources(dolphin-emu PRIVATE "${qtcocoa_location}") target_sources(dolphin-mpn PRIVATE "${qtcocoa_location}")
set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms) set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms)
get_target_property(qtmacstyle_location Qt6::QMacStylePlugin LOCATION) get_target_property(qtmacstyle_location Qt6::QMacStylePlugin LOCATION)
target_sources(dolphin-emu PRIVATE "${qtmacstyle_location}") target_sources(dolphin-mpn PRIVATE "${qtmacstyle_location}")
set_source_files_properties("${qtmacstyle_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/styles) set_source_files_properties("${qtmacstyle_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/styles)
# Copy resources into the bundle # Copy resources into the bundle