diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 7bdf4721..4d719f6b 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -17,6 +17,19 @@ SET(servatrice_SOURCES ${VERSION_STRING_CPP} ) +set(servatrice_RESOURCES servatrice.qrc) + +if(WIN32) + set(servatrice_SOURCES ${servatrice_SOURCES} servatrice.rc) +endif(WIN32) + + +if(APPLE) + set(MACOSX_BUNDLE_ICON_FILE appicon.icns) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set(servatrice_SOURCES ${servatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) +ENDIF(APPLE) + set(SERVATRICE_LIBS) # Qt4 stuff @@ -32,6 +45,7 @@ if(Qt4_FOUND) # Libgcrypt is required only with Qt4 to support SHA512 hashing FIND_PACKAGE(Libgcrypt REQUIRED) INCLUDE_DIRECTORIES(${LIBGCRYPT_INCLUDE_DIR}) + QT4_ADD_RESOURCES(servatrice_RESOURCES_RCC ${servatrice_RESOURCES}) endif() # qt5 stuff @@ -53,6 +67,8 @@ if(Qt5Widgets_FOUND) list(APPEND SERVATRICE_LIBS Sql) endif() + QT5_ADD_RESOURCES(servatrice_RESOURCES_RCC ${servatrice_RESOURCES}) + # guess plugins and libraries directory set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins") get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION) @@ -68,7 +84,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # Build servatrice binary and link it -ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_MOC_SRCS}) +ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_RESOURCES_RCC} ${servatrice_MOC_SRCS}) if(Qt4_FOUND) if(MSVC) diff --git a/servatrice/resources/appicon.icns b/servatrice/resources/appicon.icns new file mode 100644 index 00000000..2dece9b0 Binary files /dev/null and b/servatrice/resources/appicon.icns differ diff --git a/servatrice/resources/appicon.ico b/servatrice/resources/appicon.ico new file mode 100644 index 00000000..35663487 Binary files /dev/null and b/servatrice/resources/appicon.ico differ diff --git a/servatrice/resources/cockatrice.png b/servatrice/resources/cockatrice.png new file mode 100644 index 00000000..7d701ef0 Binary files /dev/null and b/servatrice/resources/cockatrice.png differ diff --git a/servatrice/resources/cockatrice.svg b/servatrice/resources/cockatrice.svg new file mode 100644 index 00000000..6ae08524 --- /dev/null +++ b/servatrice/resources/cockatrice.svg @@ -0,0 +1,779 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/servatrice/servatrice.qrc b/servatrice/servatrice.qrc new file mode 100644 index 00000000..e64960b7 --- /dev/null +++ b/servatrice/servatrice.qrc @@ -0,0 +1,5 @@ + + + resources/cockatrice.svg + + diff --git a/servatrice/servatrice.rc b/servatrice/servatrice.rc new file mode 100644 index 00000000..cf949f31 --- /dev/null +++ b/servatrice/servatrice.rc @@ -0,0 +1 @@ +ID1_ICON1 ICON DISCARDABLE "resources/appicon.ico"