X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/0edf62b8deee098d5791721eb39788ae193828fc..73aeb9e8d453dad84d94be98bc91f19adee6ccb6:/win32/installer/viking-installer.nsi

diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index 98ebf789..771b0d3a 100644
--- a/win32/installer/viking-installer.nsi
+++ b/win32/installer/viking-installer.nsi
@@ -35,6 +35,7 @@ SetDateSave on
 !include "Sections.nsh"
 !include "WinVer.nsh"
 !include "LogicLib.nsh"
+!include "x64.nsh"
 ;; http://nsis.sourceforge.net/File_Association
 !include "FileAssociation.nsh"
 
@@ -244,7 +245,11 @@ Section $(VIKING_SECTION_TITLE) SecViking
     ; Common settings
     WriteRegStr SHCTX ${VIKING_REG_KEY} "" "$INSTDIR"
     WriteRegStr SHCTX ${VIKING_REG_KEY} "Version" "${VIKING_VERSION}"
-    WriteRegStr SHCTX "${VIKING_UNINSTALL_KEY}" "DisplayName" "Viking"
+    ${If} ${RunningX64}
+      WriteRegStr SHCTX "${VIKING_UNINSTALL_KEY}" "DisplayName" "Viking (x86)"
+    ${Else}
+      WriteRegStr SHCTX "${VIKING_UNINSTALL_KEY}" "DisplayName" "Viking (x64)"
+    ${EndIf}
     WriteRegStr SHCTX "${VIKING_UNINSTALL_KEY}" "DisplayVersion" "${VIKING_VERSION}"
     WriteRegStr SHCTX "${VIKING_UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\viking_icon.ico"
     WriteRegStr SHCTX "${VIKING_UNINSTALL_KEY}" "HelpLink" "http://sourceforge.net/p/viking/wikiallura"
@@ -264,6 +269,8 @@ Section $(VIKING_SECTION_TITLE) SecViking
     File ${BINARIES}\magic.mgc
     File /r ${BINARIES}\data
     File /r ${BINARIES}\locale
+    File /r ${BINARIES}\share
+    File /r ${BINARIES}\lib
 
     ; Estimate install size based on files in $INSTDIR
     ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
@@ -372,6 +379,8 @@ Section Uninstall
     Delete "$INSTDIR\data\*xml"
     RMDir "$INSTDIR\data"
     RMDir /r "$INSTDIR\locale"
+    RMDir /r "$INSTDIR\lib"
+    RMDir /r "$INSTDIR\share"
     RMDir "$INSTDIR"
 
     ; Shortcuts..
@@ -546,8 +555,12 @@ Function .onInit
   Pop $R0
 
   StrCmp $R0 "HKLM" 0 user_dir
-    StrCpy $INSTDIR "$PROGRAMFILES\Viking"
-    Goto instdir_done
+  ${If} ${RunningX64}
+    StrCpy $INSTDIR "$PROGRAMFILES64\Viking"
+  ${Else}
+    StrCpy $INSTDIR "$PROGRAMFILES\Viking" ; $PROGRAMFILES32 also works
+  ${EndIf}
+  Goto instdir_done
   user_dir:
     Push $SMPROGRAMS
     ${GetParent} $SMPROGRAMS $R2