diff --git a/CMakeLists.txt b/CMakeLists.txt index 80c68d893..d9dba03f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -932,15 +932,15 @@ if(NOT SKIP_LIBRARY) install(TARGETS ${BINARY_NAME} LIBRARY DESTINATION ${LIBDIR} COMPONENT ${BINARY_NAME}-dev NAMELINK_ONLY) endif() if(UNIX AND NOT APPLE AND NOT HAIKU) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-16.png DESTINATION share/icons/hicolor/16x16/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-24.png DESTINATION share/icons/hicolor/24x24/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-32.png DESTINATION share/icons/hicolor/32x32/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-48.png DESTINATION share/icons/hicolor/48x48/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-64.png DESTINATION share/icons/hicolor/64x64/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-96.png DESTINATION share/icons/hicolor/96x96/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-128.png DESTINATION share/icons/hicolor/128x128/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-256.png DESTINATION share/icons/hicolor/256x256/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/mgba-512.png DESTINATION share/icons/hicolor/512x512/apps RENAME mgba.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-64.png DESTINATION share/icons/hicolor/64x64/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-96.png DESTINATION share/icons/hicolor/96x96/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-256.png DESTINATION share/icons/hicolor/256x256/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/icon-512.png DESTINATION share/icons/hicolor/512x512/apps RENAME ${BINARY_NAME}.png COMPONENT lib${BINARY_NAME}) endif() else() set(BUILD_SHARED OFF) diff --git a/res/medusa-emu-1024.png b/res/icon-1024.png similarity index 100% rename from res/medusa-emu-1024.png rename to res/icon-1024.png diff --git a/res/medusa-emu-128.png b/res/icon-128.png similarity index 100% rename from res/medusa-emu-128.png rename to res/icon-128.png diff --git a/res/medusa-emu-16.png b/res/icon-16.png similarity index 100% rename from res/medusa-emu-16.png rename to res/icon-16.png diff --git a/res/medusa-emu-24.png b/res/icon-24.png similarity index 100% rename from res/medusa-emu-24.png rename to res/icon-24.png diff --git a/res/medusa-emu-256.png b/res/icon-256.png similarity index 100% rename from res/medusa-emu-256.png rename to res/icon-256.png diff --git a/res/medusa-emu-32.png b/res/icon-32.png similarity index 100% rename from res/medusa-emu-32.png rename to res/icon-32.png diff --git a/res/medusa-emu-48.png b/res/icon-48.png similarity index 100% rename from res/medusa-emu-48.png rename to res/icon-48.png diff --git a/res/medusa-emu-512.png b/res/icon-512.png similarity index 100% rename from res/medusa-emu-512.png rename to res/icon-512.png diff --git a/res/medusa-emu-64.png b/res/icon-64.png similarity index 100% rename from res/medusa-emu-64.png rename to res/icon-64.png diff --git a/res/medusa-emu-96.png b/res/icon-96.png similarity index 100% rename from res/medusa-emu-96.png rename to res/icon-96.png diff --git a/res/medusa-emu.icns b/res/icon.icns similarity index 100% rename from res/medusa-emu.icns rename to res/icon.icns diff --git a/res/medusa-emu.ico b/res/icon.ico similarity index 100% rename from res/medusa-emu.ico rename to res/icon.ico diff --git a/res/medusa-emu-qt.desktop b/res/qt.desktop similarity index 100% rename from res/medusa-emu-qt.desktop rename to res/qt.desktop diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index c3c771c45..d1d167c10 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -231,16 +231,16 @@ endif() qt5_add_resources(RESOURCES resources.qrc) if(APPLE) - set(MACOSX_BUNDLE_ICON_FILE ${BINARY_NAME}.icns) + set(MACOSX_BUNDLE_ICON_FILE icon.icns) set(MACOSX_BUNDLE_BUNDLE_VERSION ${LIB_VERSION_STRING}) set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}) set(MACOSX_BUNDLE_GUI_IDENTIFIER com.endrift.${BINARY_NAME}-qt) - set_source_files_properties(${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set_source_files_properties(${CMAKE_SOURCE_DIR}/res/icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) endif() if(WIN32) configure_file(${CMAKE_SOURCE_DIR}/res/win.rc.in ${CMAKE_BINARY_DIR}/res/${BINARY_NAME}.rc) list(APPEND RESOURCES ${CMAKE_BINARY_DIR}/res/${BINARY_NAME}.rc) - set_source_files_properties(${CMAKE_BINARY_DIR}/res/${BINARY_NAME}.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}.ico) + set_source_files_properties(${CMAKE_BINARY_DIR}/res/${BINARY_NAME}.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/res/icon.ico) endif() if(NOT DEFINED DATADIR) if(APPLE) @@ -295,7 +295,7 @@ endif() qt5_wrap_ui(UI_SRC ${UI_FILES}) -add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_SRC} ${AUDIO_SRC} ${RESOURCES}) +add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/icon.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_SRC} ${AUDIO_SRC} ${RESOURCES}) set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in COMPILE_DEFINITIONS "${FEATURE_DEFINES};${FUNCTION_DEFINES};${OS_DEFINES};${QT_DEFINES}" COMPILE_OPTIONS "${FEATURE_FLAGS}") if(WIN32) @@ -333,7 +333,7 @@ install(TARGETS ${BINARY_NAME}-qt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${BINARY_NAME}-qt BUNDLE DESTINATION Applications COMPONENT ${BINARY_NAME}-qt) if(UNIX AND NOT APPLE) - install(FILES ${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}-qt.desktop DESTINATION share/applications COMPONENT ${BINARY_NAME}-qt) + install(FILES ${CMAKE_SOURCE_DIR}/res/qt.desktop DESTINATION share/applications RENAME ${BINARY_NAME}-qt.desktop COMPONENT ${BINARY_NAME}-qt) endif() if(UNIX) install(FILES ${CMAKE_SOURCE_DIR}/doc/${BINARY_NAME}-qt.6 DESTINATION ${MANDIR}/man6 COMPONENT ${BINARY_NAME}-qt)