!include "Sections.nsh"
!include "WinVer.nsh"
!include "LogicLib.nsh"
+!include "x64.nsh"
;; http://nsis.sourceforge.net/File_Association
!include "FileAssociation.nsh"
; 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"
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
Delete "$INSTDIR\data\*xml"
RMDir "$INSTDIR\data"
RMDir /r "$INSTDIR\locale"
+ RMDir /r "$INSTDIR\lib"
+ RMDir /r "$INSTDIR\share"
RMDir "$INSTDIR"
; Shortcuts..
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