support packaging 64 bit version

config.nsh

@@ -2,17 +2,20 @@
 ;  config.nsh - Psi Installer Configuration File
 ;*******************************************************************************
 
-!define APPVERSION "0.12"
+!define APPVERSION "0.14"
 !define APPEXTRAVERSION ""
 
 !define BUILD_WITH_LANGPACKS
 ; ^ comment if you want to build the installer without language packs
 
+;!define BUILD_32
+; ^ uncomment to package a 32-bit psi. otherwise 64-bit psi is assumed
+
 !define INSTALLER_HOME "/Volumes/Home/Projects/psi/win-installer/psi-0.12"
 
-!define INSTALLER_BUILD "1"
+!define INSTALLER_BUILD "0"
 ; ^ update whenever you add something to the installer and rebuild it
 ;   without changing APPVERSION
 ; ^ reset to 0 when you change APPVERSION
 
-!define FILE_SEPARATOR "/"
+!define FILE_SEPARATOR "\"

src/psi.nsi

@@ -26,7 +26,7 @@
 !define INSTALLER_VERSION "2.0"
 
 ; Psi Installer Configuration File
-!include "../config.nsh"
+!include "..\config.nsh"
 
 ; Application name
 !define APPNAME "Psi"
@@ -95,11 +95,23 @@ BrandingText "- ${APPNAMEANDVERSION} installer - build ${INSTALLER_BUILD} / scri
 !define APP_SOURCE "${APP_BUILD}psi_app${FILE_SEPARATOR}"
 
 Name "${APPNAMEANDVERSION}"
-InstallDir "$PROGRAMFILES\${APPNAME}"
+!ifdef BUILD_32
+  InstallDir "$PROGRAMFILES\${APPNAME}"
+!else
+  InstallDir "$PROGRAMFILES64\${APPNAME}"
+!endif
 !ifdef BUILD_WITH_LANGPACKS
-  OutFile "${APP_BUILD}${LCAPPNAME}-${APPFULLVERSION}-win-setup.exe"
+!ifdef BUILD_32
+  OutFile "${APP_BUILD}${LCAPPNAME}-${APPFULLVERSION}-win32-setup.exe"
+!else
+  OutFile "${APP_BUILD}${LCAPPNAME}-${APPFULLVERSION}-win64-setup.exe"
+!endif
+!else
+!ifdef BUILD_32
+  OutFile "${APP_BUILD}${LCAPPNAME}-${APPFULLVERSION}-win32-setup-base.exe"
 !else
-  OutFile "${APP_BUILD}${LCAPPNAME}-${APPFULLVERSION}-win-setup-base.exe"
+  OutFile "${APP_BUILD}${LCAPPNAME}-${APPFULLVERSION}-win64-setup-base.exe"
+!endif
 !endif
 
 InstallDirRegKey HKLM "Software\Affinix\${APPNAME}" ""