From a64b03c1da775bd6f83214d769571b4a9d202aef Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Wed, 18 Oct 2017 07:04:35 +0200 Subject: [PATCH 01/10] Remove obsolete mask argument of many draw functions --- src/button.cxx | 2 +- src/decor.cxx | 2 +- src/decstat.cxx | 4 ++-- src/event.cxx | 6 +++--- src/pixmap.cxx | 11 ++++------- src/pixmap.h | 11 ++++------- src/progress.cxx | 2 +- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/button.cxx b/src/button.cxx index 1ae2e48..7247a63 100644 --- a/src/button.cxx +++ b/src/button.cxx @@ -155,7 +155,7 @@ CButton::Draw () rect.right = m_pos.x + m_dim.x; rect.top = m_pos.y; rect.bottom = m_pos.y + m_dim.y; - m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect, 1); // dessine le fond + m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect); // dessine le fond return; } diff --git a/src/decor.cxx b/src/decor.cxx index 088fcf0..f6bf15c 100644 --- a/src/decor.cxx +++ b/src/decor.cxx @@ -684,7 +684,7 @@ CDecor::BuildMoveFloor (Sint32 x, Sint32 y, Point pos, Sint32 rank) m_move[rank].maskChannel, icon, m_move[rank].channel, m_move[rank].icon, 0); - m_pPixmap->DrawIcon (-1, m_move[rank].channel, 0, pos, true); + m_pPixmap->DrawIcon (-1, m_move[rank].channel, 0, pos); } else { diff --git a/src/decstat.cxx b/src/decstat.cxx index 89fafab..057d916 100644 --- a/src/decstat.cxx +++ b/src/decstat.cxx @@ -693,7 +693,7 @@ CDecor::StatisticDraw () rect.top = pos.y; rect.bottom = pos.y + DIMSTATY; - m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); // dessine le fond + m_pPixmap->DrawPart (-1, CHBACK, pos, rect); // dessine le fond if (rank == 0 && m_bStatUp) { @@ -768,7 +768,7 @@ CDecor::StatisticDraw () rect.right = pos.x + POSDRAWX; rect.top = pos.y; rect.bottom = pos.y + 16; - m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); // dessine le fond + m_pPixmap->DrawPart (-1, CHBACK, pos, rect); // dessine le fond if (strlen (textRes)) { diff --git a/src/event.cxx b/src/event.cxx index 553af96..aeb5e77 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -2148,7 +2148,7 @@ CEvent::DrawButtons () rect.right = pos.x + 20; rect.top = pos.y; rect.bottom = pos.y + 15; - m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); // dessine le fond + m_pPixmap->DrawPart (-1, CHBACK, pos, rect); // dessine le fond if (m_speed > 1) { snprintf (res, sizeof (res), "x%d", m_speed); @@ -2166,7 +2166,7 @@ CEvent::DrawButtons () rect.right = POSDRAWX + DIMDRAWX; rect.top = 0; rect.bottom = lg; - m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); + m_pPixmap->DrawPart (-1, CHBACK, pos, rect); pos.x = POSDRAWX; pos.y = lg; @@ -2174,7 +2174,7 @@ CEvent::DrawButtons () rect.right = POSDRAWX + DIMDRAWX; rect.top = 0; rect.bottom = POSDRAWY; - m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); + m_pPixmap->DrawPart (-1, CHBACK, pos, rect); pos.x = POSDRAWX + 20; pos.y = POSDRAWY + 4; diff --git a/src/pixmap.cxx b/src/pixmap.cxx index 627744c..52b8a5e 100644 --- a/src/pixmap.cxx +++ b/src/pixmap.cxx @@ -373,8 +373,7 @@ CPixmap::IsIconPixel (size_t channel, Sint32 rank, Point pos) // Les modes sont 0=transparent, 1=opaque. bool -CPixmap::DrawIcon ( - Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask) +CPixmap::DrawIcon (Sint32 chDst, size_t channel, Sint32 rank, Point pos) { Sint32 nbx, nby; Rect rect; @@ -411,8 +410,7 @@ CPixmap::DrawIcon ( // 33,48 35,49 bool -CPixmap::DrawIconDemi ( - Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask) +CPixmap::DrawIconDemi (Sint32 chDst, size_t channel, Sint32 rank, Point pos) { Sint32 nbx, nby; Rect rect; @@ -445,7 +443,7 @@ CPixmap::DrawIconDemi ( bool CPixmap::DrawIconPart ( Sint32 chDst, size_t channel, Sint32 rank, Point pos, Sint32 startY, - Sint32 endY, bool bMask) + Sint32 endY) { Sint32 nbx, nby; Rect rect; @@ -477,8 +475,7 @@ CPixmap::DrawIconPart ( // Dessine une partie d'image n'importe o�. bool -CPixmap::DrawPart ( - Sint32 chDst, size_t channel, Point dest, Rect rect, bool bMask) +CPixmap::DrawPart (Sint32 chDst, size_t channel, Point dest, Rect rect) { if (m_SDLTextureInfo.find (channel) == m_SDLTextureInfo.end ()) return false; diff --git a/src/pixmap.h b/src/pixmap.h index 82d23bd..4f0950b 100644 --- a/src/pixmap.h +++ b/src/pixmap.h @@ -66,15 +66,12 @@ public: bool IsIconPixel (size_t channel, Sint32 rank, Point pos); - bool DrawIcon ( - Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask = false); - bool DrawIconDemi ( - Sint32 chDst, size_t channel, Sint32 rank, Point pos, bool bMask = false); + bool DrawIcon (Sint32 chDst, size_t channel, Sint32 rank, Point pos); + bool DrawIconDemi (Sint32 chDst, size_t channel, Sint32 rank, Point pos); bool DrawIconPart ( Sint32 chDst, size_t channel, Sint32 rank, Point pos, Sint32 startY, - Sint32 endY, bool bMask = false); - bool DrawPart ( - Sint32 chDst, size_t channel, Point dest, Rect rect, bool bMask = false); + Sint32 endY); + bool DrawPart (Sint32 chDst, size_t channel, Point dest, Rect rect); bool DrawImage (Sint32 chDst, size_t channel, Rect rect); bool BuildIconMask ( diff --git a/src/progress.cxx b/src/progress.cxx index b464b7d..6b131aa 100644 --- a/src/progress.cxx +++ b/src/progress.cxx @@ -72,7 +72,7 @@ CJauge::Draw () rect.right = m_pos.x + m_dim.x; rect.top = m_pos.y; rect.bottom = m_pos.y + m_dim.y; - m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect, 1); // dessine le fond + m_pPixmap->DrawPart (-1, CHBACK, m_pos, rect); // dessine le fond return; } From 6134edc96ef3952936570ec5c3fae79e1ad8a0f8 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Fri, 20 Oct 2017 16:04:46 +0200 Subject: [PATCH 02/10] Make the CURL dependency optional, through the PLANETBLUPI_HTTP_VERSION_CHECK CMake option --- CMakeLists.txt | 26 +++++++++++++++++++++++--- src/blupi.cxx | 10 +++++++++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a0a456..06bd22e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ set (PB_PRODUCT_NAME "Planet Blupi") set (PB_PACKAGE_NAME "planetblupi") set (PB_DESCRIPTION "Planet Blupi - A delerious spell-binding game") +option(PLANETBLUPI_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) + configure_file ( "${PROJECT_SOURCE_DIR}/src/config.h.in" "${PROJECT_BINARY_DIR}/include/config.h" @@ -115,7 +117,10 @@ find_package (PkgConfig REQUIRED) pkg_search_module (SDL2 REQUIRED sdl2) pkg_search_module (SDL2_MIXER REQUIRED SDL2_mixer) pkg_search_module (SDL2_IMAGE REQUIRED SDL2_image) -pkg_search_module (CURL REQUIRED libcurl) +if(${PLANETBLUPI_HTTP_VERSION_CHECK}) + pkg_search_module (CURL REQUIRED libcurl) + add_definitions(-DUSE_CURL) +endif() if ("${STATIC_BUILD}") pkg_search_module (PNG REQUIRED libpng) @@ -131,7 +136,9 @@ if ("${STATIC_BUILD}") pkg_search_module (PULSE REQUIRED libpulse) endif () - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB") + if(${PLANETBLUPI_HTTP_VERSION_CHECK}) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB") + endif () endif () ########################### @@ -147,7 +154,6 @@ if ("${STATIC_BUILD}") ${SDL2_STATIC_LIBRARIES} ${SDL2_MIXER_STATIC_LIBRARIES} ${SDL2_IMAGE_STATIC_LIBRARIES} - ${CURL_STATIC_LIBRARIES} ${SDLKitchensink_STATIC_LIBRARIES} ${PNG_STATIC_LIBRARIES} ${AVCODEC_STATIC_LIBRARIES} @@ -157,6 +163,13 @@ if ("${STATIC_BUILD}") ${SWRESAMPLE_STATIC_LIBRARIES} ) + if(${PLANETBLUPI_HTTP_VERSION_CHECK}) + set (planetblupi_DEPS + ${planetblupi_DEPS} + ${CURL_STATIC_LIBRARIES} + ) + endif () + if (UNIX AND NOT APPLE) list (APPEND planetblupi_DEPS ${ALSA_STATIC_LIBRARIES} @@ -173,6 +186,13 @@ else () ${SDLKitchensink_LIBRARIES} pthread ) + + if(${PLANETBLUPI_HTTP_VERSION_CHECK}) + set (planetblupi_DEPS + ${planetblupi_DEPS} + ${CURL_LIBRARIES} + ) + endif () endif () target_link_libraries (planetblupi PUBLIC ${planetblupi_DEPS}) diff --git a/src/blupi.cxx b/src/blupi.cxx index 13cc9b4..a2dd7e2 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -30,7 +30,9 @@ #include #include -#include +#ifdef USE_CURL + #include +#endif #include "json/json.hpp" @@ -81,11 +83,13 @@ bool g_bTermInit = false; // initialisation en cours Uint32 g_lastPhase = 999; static bool g_pause; +#ifdef USE_CURL struct url_data { CURLcode status; char * buffer; size_t size; }; +#endif template static void @@ -462,6 +466,7 @@ static size_t updateCallback (void * ptr, size_t size, size_t nmemb, void * data) { size_t realsize = size * nmemb; +#ifdef USE_CURL url_data * mem = static_cast (data); mem->buffer = @@ -472,6 +477,7 @@ updateCallback (void * ptr, size_t size, size_t nmemb, void * data) mem->size += realsize; mem->buffer[mem->size] = 0; } +#endif return realsize; } @@ -479,6 +485,7 @@ updateCallback (void * ptr, size_t size, size_t nmemb, void * data) static void CheckForUpdates () { +#ifdef USE_CURL url_data chunk; chunk.buffer = nullptr; /* we expect realloc(NULL, size) to work */ @@ -515,6 +522,7 @@ CheckForUpdates () free (chunk.buffer); curl_easy_cleanup (curl); +#endif } static int From 433768147bbe86d24dfe9e3b3fbe34ffd2be2b0d Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 20 Oct 2017 17:40:31 +0200 Subject: [PATCH 03/10] Follow coding rules (space before bracket) Prefer BP over PLANETBLUPI. --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06bd22e..38932c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set (PB_PRODUCT_NAME "Planet Blupi") set (PB_PACKAGE_NAME "planetblupi") set (PB_DESCRIPTION "Planet Blupi - A delerious spell-binding game") -option(PLANETBLUPI_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) +option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) configure_file ( "${PROJECT_SOURCE_DIR}/src/config.h.in" @@ -117,10 +117,10 @@ find_package (PkgConfig REQUIRED) pkg_search_module (SDL2 REQUIRED sdl2) pkg_search_module (SDL2_MIXER REQUIRED SDL2_mixer) pkg_search_module (SDL2_IMAGE REQUIRED SDL2_image) -if(${PLANETBLUPI_HTTP_VERSION_CHECK}) +if (${PB_HTTP_VERSION_CHECK}) pkg_search_module (CURL REQUIRED libcurl) - add_definitions(-DUSE_CURL) -endif() + add_definitions (-DUSE_CURL) +endif () if ("${STATIC_BUILD}") pkg_search_module (PNG REQUIRED libpng) @@ -136,7 +136,7 @@ if ("${STATIC_BUILD}") pkg_search_module (PULSE REQUIRED libpulse) endif () - if(${PLANETBLUPI_HTTP_VERSION_CHECK}) + if (${PB_HTTP_VERSION_CHECK}) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB") endif () endif () @@ -163,7 +163,7 @@ if ("${STATIC_BUILD}") ${SWRESAMPLE_STATIC_LIBRARIES} ) - if(${PLANETBLUPI_HTTP_VERSION_CHECK}) + if (${PB_HTTP_VERSION_CHECK}) set (planetblupi_DEPS ${planetblupi_DEPS} ${CURL_STATIC_LIBRARIES} @@ -187,7 +187,7 @@ else () pthread ) - if(${PLANETBLUPI_HTTP_VERSION_CHECK}) + if (${PB_HTTP_VERSION_CHECK}) set (planetblupi_DEPS ${planetblupi_DEPS} ${CURL_LIBRARIES} From cce3961fc8413e5d58ae068425e2ef2dad5b0319 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 20 Oct 2017 17:41:40 +0200 Subject: [PATCH 04/10] CMake: use list(APPEND) instead of set --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38932c9..de2ddee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,8 +164,7 @@ if ("${STATIC_BUILD}") ) if (${PB_HTTP_VERSION_CHECK}) - set (planetblupi_DEPS - ${planetblupi_DEPS} + list (APPEND planetblupi_DEPS ${CURL_STATIC_LIBRARIES} ) endif () @@ -188,8 +187,7 @@ else () ) if (${PB_HTTP_VERSION_CHECK}) - set (planetblupi_DEPS - ${planetblupi_DEPS} + list (APPEND planetblupi_DEPS ${CURL_LIBRARIES} ) endif () From a7018dbc5019be06fe10916deaeec9d700fce17d Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 20 Oct 2017 17:42:42 +0200 Subject: [PATCH 05/10] Fix warning of unused function --- src/blupi.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blupi.cxx b/src/blupi.cxx index a2dd7e2..1bdf367 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -462,11 +462,11 @@ InitFail (const char * msg) FinishObjects (); } +#ifdef USE_CURL static size_t updateCallback (void * ptr, size_t size, size_t nmemb, void * data) { size_t realsize = size * nmemb; -#ifdef USE_CURL url_data * mem = static_cast (data); mem->buffer = @@ -477,10 +477,10 @@ updateCallback (void * ptr, size_t size, size_t nmemb, void * data) mem->size += realsize; mem->buffer[mem->size] = 0; } -#endif return realsize; } +#endif /* USE_CURL */ static void CheckForUpdates () From b523641b869e3097ce7cd19ab457d273c3b8c8b7 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 20 Oct 2017 17:43:05 +0200 Subject: [PATCH 06/10] Cosmetics --- src/blupi.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blupi.cxx b/src/blupi.cxx index 1bdf367..3f8c4c8 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -31,8 +31,8 @@ #include #include #ifdef USE_CURL - #include -#endif +#include +#endif /* USE_CURL */ #include "json/json.hpp" @@ -522,7 +522,7 @@ CheckForUpdates () free (chunk.buffer); curl_easy_cleanup (curl); -#endif +#endif /* USE_CURL */ } static int From 5b13b8f0bb15b816af8d464557106df5763024ab Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 20 Oct 2017 17:54:20 +0200 Subject: [PATCH 07/10] Fix typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de2ddee..f570d20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set (PB_VERSION_PATCH 0) set (PB_VERSION_EXTRA "") set (PB_PRODUCT_NAME "Planet Blupi") set (PB_PACKAGE_NAME "planetblupi") -set (PB_DESCRIPTION "Planet Blupi - A delerious spell-binding game") +set (PB_DESCRIPTION "Planet Blupi - A delirious spell-binding game") option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) From d3986d5d4aea44e43462ef875e47add8bb0cb3f7 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 20 Oct 2017 17:57:21 +0200 Subject: [PATCH 08/10] Add a category in the desktop file --- resources/linux/application.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/linux/application.desktop.in b/resources/linux/application.desktop.in index 038b99c..78fb320 100644 --- a/resources/linux/application.desktop.in +++ b/resources/linux/application.desktop.in @@ -7,4 +7,4 @@ Comment=@CPACK_PACKAGE_DESCRIPTION_SUMMARY@ Exec=@APPIMAGE_EXEC@ StartupWMClass=@APPIMAGE_EXEC_WM@ Icon=@APPIMAGE_ICON_REF@ -Categories=Game; +Categories=Game;StrategyGame; From a50e648d634493793a8aa8aa2e266ad890b121a6 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sat, 21 Oct 2017 09:39:18 +0200 Subject: [PATCH 09/10] WIP: add desktop file for standard build --- CMakeLists.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f570d20..f5d85b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,14 @@ if (APPIMAGE_APPRUN_PROGRAM AND APPIMAGE_ASSISTANT_PROGRAM) set (USE_APPIMAGE ON) endif () +if (NOT USE_APPIMAGE) + configure_file ( + "${PROJECT_SOURCE_DIR}/resources/linux/application.desktop.in" + "${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop" + @ONLY + ) +endif () + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -L${CMAKE_INSTALL_PREFIX}/lib") endif () @@ -261,6 +269,13 @@ if (UNIX AND NOT APPLE) install (DIRECTORY resources/icon/hicolor DESTINATION share/icons) endif () +if (NOT USE_APPIMAGE) + install ( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ + ) +endif () + # Copy libwinpthread-1.dll which seems not be linkable statically if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND MINGW) execute_process (COMMAND cygpath.exe --windows /mingw64 OUTPUT_VARIABLE MINGW64_PATH) From 29ad6c30f4ff1011097abb206457c5038839a67d Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sat, 21 Oct 2017 09:51:54 +0200 Subject: [PATCH 10/10] Fix deploy of desktop file with non-appimage builds --- CMakeLists.txt | 6 ++++-- resources/linux/application.desktop.in | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5d85b9..697fe7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,8 @@ set (PB_VERSION_PATCH 0) set (PB_VERSION_EXTRA "") set (PB_PRODUCT_NAME "Planet Blupi") set (PB_PACKAGE_NAME "planetblupi") +set (PB_EXEC "planetblupi") +set (PB_ICON_REF "blupi") set (PB_DESCRIPTION "Planet Blupi - A delirious spell-binding game") option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) @@ -272,7 +274,7 @@ endif () if (NOT USE_APPIMAGE) install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ + DESTINATION share/applications ) endif () @@ -303,7 +305,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND "${STATIC_BUILD}") if (USE_APPIMAGE) include (LinuxAppImageBuild) set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX}) - APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" "blupi") + APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" ${PB_ICON_REF}) elseif (MINGW) set (INSTALLER_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}") set (CPACK_PACKAGE_FILE_NAME "${INSTALLER_FILE_NAME}") diff --git a/resources/linux/application.desktop.in b/resources/linux/application.desktop.in index 78fb320..cda0397 100644 --- a/resources/linux/application.desktop.in +++ b/resources/linux/application.desktop.in @@ -3,8 +3,8 @@ Version=1.0 Type=Application Name=@PB_PRODUCT_NAME@ GenericName=Video Game -Comment=@CPACK_PACKAGE_DESCRIPTION_SUMMARY@ -Exec=@APPIMAGE_EXEC@ -StartupWMClass=@APPIMAGE_EXEC_WM@ +Comment=@PB_DESCRIPTION@ +Exec=@PB_EXEC@ +StartupWMClass=@PB_EXEC@ Icon=@APPIMAGE_ICON_REF@ Categories=Game;StrategyGame;