Merge pull request #358 from poixen/serverlogo2

Servatrice logo

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) 

servatrice/servatrice.desktop

+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Servatrice
+Exec=servatrice
+Icon=servatrice
+Categories=Game;CardGame;

servatrice/servatrice.qrc

+<RCC>
+    <qresource prefix="/" >    
+        <file alias="resources/appicon.svg">resources/servatrice.svg</file>
+    </qresource>
+</RCC>

servatrice/servatrice.rc

+ID1_ICON1	ICON	DISCARDABLE	"resources/appicon.ico"