diff --git a/pkg/gpxsee.nsi b/pkg/gpxsee.nsi index 5b220269..51e0266c 100644 --- a/pkg/gpxsee.nsi +++ b/pkg/gpxsee.nsi @@ -86,6 +86,9 @@ Section "GPXSee" SEC_APP File /r "maps" File /r "csv" + ; Create the uninstaller + WriteUninstaller "$INSTDIR\uninstall.exe" + ; Create start menu entry and add links SetShellVarContext all !insertmacro MUI_STARTMENU_WRITE_BEGIN Application @@ -94,9 +97,6 @@ Section "GPXSee" SEC_APP CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe" !insertmacro MUI_STARTMENU_WRITE_END - ; Create the uninstaller - WriteUninstaller "$INSTDIR\uninstall.exe" - ; Write the installation path into the registry DetailPrint "Registering application..." WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR" @@ -106,6 +106,9 @@ Section "GPXSee" SEC_APP WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tůma" WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}" WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegStr HKLM "${REGENTRY}" "DisplayIcon" '"$INSTDIR\gpxsee.exe"' + WriteRegStr HKLM "${REGENTRY}" "InstallLocation" '"$INSTDIR"' + WriteRegStr HKLM "${REGENTRY}" "URLInfoAbout" "https://www.gpxsee.org" WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1 WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1 @@ -209,6 +212,8 @@ SectionEnd Section "OpenSSL" SEC_OPENSSL + SectionIn RO + File "libcrypto-1_1.dll" File "libssl-1_1.dll" diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index 5ba29cb1..2fa5eb03 100644 --- a/pkg/gpxsee64.nsi +++ b/pkg/gpxsee64.nsi @@ -93,6 +93,9 @@ Section "GPXSee" SEC_APP File /r "maps" File /r "csv" + ; Create the uninstaller + WriteUninstaller "$INSTDIR\uninstall.exe" + ; Create start menu entry and add links SetShellVarContext all !insertmacro MUI_STARTMENU_WRITE_BEGIN Application @@ -101,9 +104,6 @@ Section "GPXSee" SEC_APP CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe" !insertmacro MUI_STARTMENU_WRITE_END - ; Create the uninstaller - WriteUninstaller "$INSTDIR\uninstall.exe" - ; Write the installation path into the registry DetailPrint "Registering application..." WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR" @@ -113,6 +113,9 @@ Section "GPXSee" SEC_APP WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tůma" WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}" WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegStr HKLM "${REGENTRY}" "DisplayIcon" '"$INSTDIR\gpxsee.exe"' + WriteRegStr HKLM "${REGENTRY}" "InstallLocation" '"$INSTDIR"' + WriteRegStr HKLM "${REGENTRY}" "URLInfoAbout" "https://www.gpxsee.org" WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1 WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1 @@ -228,6 +231,8 @@ SectionEnd Section "OpenSSL" SEC_OPENSSL + SectionIn RO + File "libcrypto-1_1-x64.dll" File "libssl-1_1-x64.dll" @@ -375,4 +380,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP) !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION) -!insertmacro MUI_FUNCTION_DESCRIPTION_END +!insertmacro MUI_FUNCTION_DESCRIPTION_END \ No newline at end of file