diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2018-02-24 12:20:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 12:20:31 -0800 |
| commit | 941ddfb830bc69fb08427c7db760381f8dccd735 (patch) | |
| tree | 4d779c17ed86dfd49e107fde24eb86284de5bc3a /Source/Core | |
| parent | 15b23270b20502ab5754678f3aa998bcc5aace92 (diff) | |
| parent | 7f3c1a2de47b7b39a7ba0e272fc897ddf48b1012 (diff) | |
Merge pull request #6397 from spycrab/qt_osx_icon
Qt/OSX: Fix icon
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/Info.plist.in | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/resources/Dolphin.icns | bin | 103023 -> 0 bytes |
4 files changed, 6 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt index 363e5d9b0c..1a71b86c7f 100644 --- a/Source/Core/DolphinQt2/CMakeLists.txt +++ b/Source/Core/DolphinQt2/CMakeLists.txt @@ -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}") diff --git a/Source/Core/DolphinQt2/Info.plist.in b/Source/Core/DolphinQt2/Info.plist.in index f5356e6207..5e682e18a8 100644 --- a/Source/Core/DolphinQt2/Info.plist.in +++ b/Source/Core/DolphinQt2/Info.plist.in @@ -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> diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 505d11268f..d1ed79c781 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -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) diff --git a/Source/Core/DolphinWX/resources/Dolphin.icns b/Source/Core/DolphinWX/resources/Dolphin.icns Binary files differdeleted file mode 100644 index 4a17b18dec..0000000000 --- a/Source/Core/DolphinWX/resources/Dolphin.icns +++ /dev/null |