From 48ad9545f6a8032176efc3bd1ab69692edfd972a Mon Sep 17 00:00:00 2001
From: Jakub Neruda <nerudaj@email.cz>
Date: Fri, 15 Nov 2024 17:06:57 +0100
Subject: [PATCH] Links generated from installer correctly launch the game

---
 CMakeLists.txt | 10 +++++++++-
 changelog.txt  |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c83798..02d6007 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,6 @@ set ( CPACK_PACKAGE_VENDOR           "Jakub Neruda")
 set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/nsis/description.txt" )
 set ( CPACK_PACKAGE_HOMEPAGE_URL     "https://nerudaj.itch.io/rend" )
 set ( CPACK_RESOURCE_FILE_LICENSE    "${CMAKE_SOURCE_DIR}/nsis/license.txt" )
-set ( CPACK_PACKAGE_EXECUTABLES      "${SETTINGS_BINARY_NAME}" "${CMAKE_SOURCE_DIR}/resources/graphics/appicon.ico" )
 
 if ( ${MAKE_INSTALLER} )
 	include(InstallRequiredSystemLibraries)
@@ -85,6 +84,15 @@ if ( ${MAKE_INSTALLER} )
 		"${PROJECT_SOURCE_DIR}/nsis"
 		${CMAKE_MODULE_PATH}
 	)
+    set ( CPACK_NSIS_DISPLAY_NAME "${SETTINGS_PROJECT_NAME}" )
+    set ( CPACK_NSIS_PACKAGE_NAME "${SETTINGS_PROJECT_NAME}" )
+    set ( CPACK_PACKAGE_INSTALL_DIRECTORY "${SETTINGS_PROJECT_NAME}" )
+    set ( CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${SETTINGS_PROJECT_NAME}" )
+
+    list ( APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS "  SetOutPath '$INSTDIR\\bin'" )
+    list ( APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS "  CreateShortcut '$DESKTOP\\${SETTINGS_PROJECT_NAME}.lnk' '$INSTDIR\\bin\\${SETTINGS_BINARY_NAME}.exe'" )
+    list ( APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS "  CreateShortcut '$SMPROGRAMS\\$STARTMENU_FOLDER\\${SETTINGS_PROJECT_NAME}.lnk' '$INSTDIR\\bin\\${SETTINGS_BINARY_NAME}.exe'" )
+    string (REPLACE ";" "\n" CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}")
 else()
 	set ( CPACK_GENERATOR "ZIP" )
 	if ( ${IS_NIGHTBUILD} )
diff --git a/changelog.txt b/changelog.txt
index 438bc8b..1817b7b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,10 @@ Rend 0.10.0 changelog:
 Gameplay:
 * Added new CTF map: "CTF Longway"
 
+Bugfixes:
+* Start Menu link generated by the installer now correctly launches the game
+    * Desktop link is also created
+
 UX:
 * Random map rotation can be chosen in game setup lobby
 * Game setup lobby configuration is remembered