From d40d4c1cf226761bb8d6ec8e40b7da3cd17add99 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 25 Oct 2014 03:21:46 -0700 Subject: [PATCH] Use ICO file on Windows --- res/mgba.rc | 1 + src/platform/qt/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 res/mgba.rc diff --git a/res/mgba.rc b/res/mgba.rc new file mode 100644 index 000000000..d6a546ea4 --- /dev/null +++ b/res/mgba.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "mgba.ico" diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 01a512ddd..49f953e5d 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -49,7 +49,9 @@ set(MACOSX_BUNDLE_GUI_IDENTIFIER com.endrift.${BINARY_NAME}-qt) set_source_files_properties(${CMAKE_SOURCE_DIR}/res/mgba.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) qt5_add_resources(RESOURCES resources.qrc) -message(STATUS ${RESOURCES}) +if(WIN32) + list(APPEND RESOURCES ${CMAKE_SOURCE_DIR}/res/mgba.rc) +endif() add_executable(mGBA WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/mgba.icns ${SOURCE_FILES} ${UI_FILES} ${RESOURCES}) set_target_properties(mGBA PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in)