Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Links generated from installer correctly launch the game #31

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Links generated from installer correctly launch the game #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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} )
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading