summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre de La Morinerie <kemenaran@gmail.com>2015-09-11 22:08:42 +0200
committerPierre de La Morinerie <kemenaran@gmail.com>2015-10-14 15:02:36 +0200
commit22421528b7ec5238d5092ab3b6fb6a4e897d03b1 (patch)
tree120527561faa57a800b1bfcf2b40839d854262ee
parentMerge pull request #1194 from linkmauve/no-newline (diff)
downloadyuzu-22421528b7ec5238d5092ab3b6fb6a4e897d03b1.tar
yuzu-22421528b7ec5238d5092ab3b6fb6a4e897d03b1.tar.gz
yuzu-22421528b7ec5238d5092ab3b6fb6a4e897d03b1.tar.bz2
yuzu-22421528b7ec5238d5092ab3b6fb6a4e897d03b1.tar.lz
yuzu-22421528b7ec5238d5092ab3b6fb6a4e897d03b1.tar.xz
yuzu-22421528b7ec5238d5092ab3b6fb6a4e897d03b1.tar.zst
yuzu-22421528b7ec5238d5092ab3b6fb6a4e897d03b1.zip
-rw-r--r--dist/citra.icnsbin0 -> 1027012 bytes
-rw-r--r--src/citra_qt/CMakeLists.txt4
2 files changed, 3 insertions, 1 deletions
diff --git a/dist/citra.icns b/dist/citra.icns
new file mode 100644
index 000000000..9d3dcca83
--- /dev/null
+++ b/dist/citra.icns
Binary files differ
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 747ad5519..bbf6ae001 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -72,7 +72,9 @@ else()
endif()
if (APPLE)
- add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS})
+ set(MACOSX_ICON "../../dist/citra.icns")
+ set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON})
set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
else()
add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})