ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt/OSX: Fix icon

This commit is contained in:
spycrab 2018-02-24 21:12:22 +01:00
parent b66f96c617
commit 7f3c1a2de4
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Source/Core/DolphinWX/resources/Dolphin.icns → Data/Dolphin.icns
View File

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

@ -173,6 +173,10 @@ if(APPLE)
target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf") target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf")
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
# Copy icon into the bundle
target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
# Copy Qt plugins into the bundle # Copy Qt plugins into the bundle
get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION) get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION)
target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}") target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}")

2
Source/Core/DolphinQt2/Info.plist.in
View File

@ -28,7 +28,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>dolphin-emu-qt2</string> <string>dolphin-emu-qt2</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Resources/Dolphin.icns</string> <string>Dolphin.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.dolphin-emu.dolphin</string> <string>org.dolphin-emu.dolphin</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>

2
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -93,7 +93,7 @@ set(LIBS
if(APPLE) if(APPLE)
# Add resource files to application bundle. # Add resource files to application bundle.
set(RESOURCES resources/Dolphin.icns) set(RESOURCES "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
list(APPEND SRCS ${RESOURCES}) list(APPEND SRCS ${RESOURCES})
set_source_files_properties(${RESOURCES} PROPERTIES set_source_files_properties(${RESOURCES} PROPERTIES
MACOSX_PACKAGE_LOCATION Resources) MACOSX_PACKAGE_LOCATION Resources)