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

Merge pull request #6397 from spycrab/qt_osx_icon

Browse Source 
Qt/OSX: Fix icon
This commit is contained in:
Anthony 2018-02-24 12:20:31 -08:00 committed by GitHub
commit 941ddfb830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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")
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
get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION)
target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}")

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

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

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

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