From 7f3c1a2de47b7b39a7ba0e272fc897ddf48b1012 Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Sat, 24 Feb 2018 21:12:22 +0100
Subject: Qt/OSX: Fix icon

---
 Source/Core/DolphinQt2/CMakeLists.txt        |   4 ++++
 Source/Core/DolphinQt2/Info.plist.in         |   2 +-
 Source/Core/DolphinWX/CMakeLists.txt         |   2 +-
 Source/Core/DolphinWX/resources/Dolphin.icns | Bin 103023 -> 0 bytes
 4 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 Source/Core/DolphinWX/resources/Dolphin.icns

(limited to 'Source')

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
deleted file mode 100644
index 4a17b18dec..0000000000
Binary files a/Source/Core/DolphinWX/resources/Dolphin.icns and /dev/null differ
-- 
cgit v1.2.3