From d69334776545977a14e54a9b467f8da4e0d3438e Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Thu, 28 Apr 2011 05:16:19 -0400
Subject: DISTS: Update NSIS installer shortcut creation

 - Fix missing CreateDirectory directive to create the base shortcut folder
 - Add Readme to the list of shortcuts
---
 dists/nsis/scummvm.nsi    | 6 ++++--
 dists/nsis/scummvm.nsi.in | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'dists/nsis')

diff --git a/dists/nsis/scummvm.nsi b/dists/nsis/scummvm.nsi
index a83cd251e0..a1e8ef46ff 100644
--- a/dists/nsis/scummvm.nsi
+++ b/dists/nsis/scummvm.nsi
@@ -237,7 +237,9 @@ Section -post SecMainPost
 	SetOutPath $INSTDIR
 	WriteUninstaller $INSTDIR\uninstall.exe
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\$(^Name).exe" "" "$INSTDIR\$(^Name).exe" 0    ; Create shortcut with icon
+	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           $INSTDIR\$(^Name).exe
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             $INSTDIR\README.txt
 	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
 	!insertmacro MUI_STARTMENU_WRITE_END
 	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -255,7 +257,7 @@ SectionEnd
 Function .onInit
 	!insertmacro MUI_LANGDLL_DISPLAY
 
-!ifdef _DEBUG
+!ifdef _DEBUG && NSIS_CONFIG_LOG
 	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
 !endif
 FunctionEnd
diff --git a/dists/nsis/scummvm.nsi.in b/dists/nsis/scummvm.nsi.in
index eca619c312..9f92d27c3d 100644
--- a/dists/nsis/scummvm.nsi.in
+++ b/dists/nsis/scummvm.nsi.in
@@ -237,7 +237,9 @@ Section -post SecMainPost
 	SetOutPath $INSTDIR
 	WriteUninstaller $INSTDIR\uninstall.exe
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\$(^Name).exe" "" "$INSTDIR\$(^Name).exe" 0    ; Create shortcut with icon
+	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           $INSTDIR\$(^Name).exe
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             $INSTDIR\README.txt
 	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
 	!insertmacro MUI_STARTMENU_WRITE_END
 	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -255,7 +257,7 @@ SectionEnd
 Function .onInit
 	!insertmacro MUI_LANGDLL_DISPLAY
 
-!ifdef _DEBUG
+!ifdef _DEBUG && NSIS_CONFIG_LOG
 	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
 !endif
 FunctionEnd
-- 
cgit v1.2.3