--- misc/trunk/win32_installer/linuxsampler_all.nsi	2009/05/12 15:54:11	1902
+++ misc/trunk/win32_installer/linuxsampler_all.nsi	2015/01/04 01:32:55	2686
@@ -1,27 +1,37 @@
 ; LinuxSampler Windows installer
 ;
-; Copyright (C) 2007-2009, The LinuxSampler Developers
+; Copyright (C) 2007-2015, The LinuxSampler Developers
 ;
 ; All-in-one Installer for all subprojects / software components of the
 ; LinuxSampler Project.
 ;
 ; PREREQUISITES:
 ;
-; -> You must install the file cpudesc\cpudesc.dll into the NSIS's
-;    plugin directory before being able to compile this installer!
+; -> You must install the file cpudesc\cpudesc.dll into the working
+;    directory before being able to compile this installer!
 ;
 ; -> The compiled binaries must be placed into the respective directories
 ;    under bin\ (you have to read this file in order to get those exact
 ;    locations and expected file names).
 
+; NSIS plug-in for getting CPU information
+!addplugindir cpudesc
+
 ; Probably the best compression ratio
 SetCompressor lzma
 
 ;Include Modern UI
 !include "MUI.nsh"
 !include "EnvVarUpdate.nsh"
+!include "WordFunc.nsh"
 
-!define RELEASE_DATE "20090512"
+!define /date RELEASE_DATE "%Y%m%d"
+!searchparse /file bin/686/linuxsampler.pc `Version: ` LINUXSAMPLER_VERSION
+!searchparse /file bin/686/gig.pc `Version: ` LIBGIG_VERSION
+!searchparse /file bin/686/gigedit.version `` GIGEDIT_VERSION
+!define FANTASIA_VERSION "0.9"
+!searchparse /file bin/686/qsampler.version `` QSAMPLER_VERSION
+!searchparse /file bin/686/sndfile.pc `Version: ` SNDFILE_VERSION
 
 ; The name of the installer
 Name "LinuxSampler (${RELEASE_DATE})"
@@ -31,11 +41,17 @@
 
 ; Java Runtime Environment, needed for JSampler
 !define JRE_VERSION "1.6"
-!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=11292"
+; jre-7u67-windows-i586.exe:
+!define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=95123"
+; jre-7u67-windows-x64.exe:
+!define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=95125"
 
 ; The default installation directory
 InstallDir "$PROGRAMFILES64\LinuxSampler"
+!define SUBDIR_32_BIT "32"
+!define SUBDIR_64_BIT "64"
 
+!define DEFAULT_VST_DIR64 "$PROGRAMFILES64\Steinberg\VstPlugins"
 !define DEFAULT_VST_DIR "$PROGRAMFILES\Steinberg\VstPlugins"
 
 ; Get installation folder from registry if available
@@ -48,22 +64,12 @@
 !define MUI_HEADERIMAGE_BITMAP "linuxsampler.bmp"
 !define MUI_ABORTWARNING
 
-;--------------------------------
-;Version Information
-
-VIProductVersion "0.0.0.0"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "all-in-one installer"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "http://linuxsampler.org"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The LinuxSampler Project"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2009 The LinuxSampler Project"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"
-
 !define BIN_TYPE_64BIT  "64 bit"
 !define BIN_TYPE_686SSE "686 SSE"
 !define BIN_TYPE_686    "686"
 
+Var /GLOBAL binType
+
 ;--------------------------------
 ; Pages
 
@@ -80,25 +86,42 @@
 !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
+;Version Information
+
+VIProductVersion "0.0.0.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "all-in-one installer"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "http://linuxsampler.org"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The LinuxSampler Project"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2014 The LinuxSampler Project"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"
+
+;--------------------------------
 
 Function .onInit
   Var /GLOBAL installingLinuxSampler
   Var /GLOBAL installingJSampler
   Var /GLOBAL installingQSampler
   Var /GLOBAL installinggigedit
+  Var /GLOBAL installing32BitToo
   StrCpy $installingLinuxSampler "0"
   StrCpy $installingJSampler "0"
   StrCpy $installingQSampler "0"
   StrCpy $installinggigedit "0"
-
-  Call DetectSystemType
+  StrCpy $installing32BitToo "0"
 FunctionEnd
 
-; detects CPU capabilities, determmines which native binary type to install
-; and selects the appropriate windows registry view (32 bit or 64 bit)
-Function DetectSystemType
-  Var /GLOBAL binType
+!macro CreateInternetShortcut FILENAME URL ICONFILE ICONINDEX
+WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
+WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconFile" "${ICONFILE}"
+WriteINIStr "${FILENAME}.url" "InternetShortcut" "IconIndex" "${ICONINDEX}"
+!macroend
 
+; detects CPU capabilities, determines which native binary type to install
+; and selects the appropriate windows registry view (32 bit or 64 bit)
+!macro DetectSystemType un
+Function ${un}DetectSystemType
   ; check if this is a 64 bit windows
   System::Call "kernel32::GetCurrentProcess() i .s"
   System::Call "kernel32::IsWow64Process(i s, *i .r0)"
@@ -126,60 +149,53 @@
 
   DetectSystemDone:
 FunctionEnd
-
-; Check for the presence of gtkmm, and if false, ask the user whether to
-; download and install gtkmm now from the internet.
-Function CheckForGtkmm
-  Var /GLOBAL gtkmmSetupFile
-
-  ClearErrors
-  ; This is just a lazy check for the presence of gtkmm, we should better use:
-  ; System::Call function (NSI internal function) to actually call an arbitrary
-  ; gtkmm function (/method) from a gtkmm DLL to make it certain
-  ReadRegStr $0 HKCU "Software\gtkmm\2.4" "Installer Language"
-  IfErrors +2 0
-  goto NoAbort
-  MessageBox MB_YESNO "gtkmm not found. Install it now (internet connection needed)?" IDYES InstallGtkmm
-    MessageBox MB_YESNO "gigedit won't work without gtkmm. Continue anyway?" IDYES NoAbort
-      Abort ;  causes installer to quit
-  InstallGtkmm:
-    ClearErrors
-	StrCpy $gtkmmSetupFile $TEMP\gtkmm-win32-runtime-2.10.11-1.exe
-    NSISdl::download "http://ftp.gnome.org/pub/gnome/binaries/win32/gtkmm/2.10/gtkmm-win32-runtime-2.10.11-1.exe" $gtkmmSetupFile
-    IfErrors 0 +2
-	Goto InstallGtkmmFailed
-	ExecWait $gtkmmSetupFile
-    Delete $gtkmmSetupFile ; we don't need it anymore
-	IfErrors 0 +2
-	Goto InstallGtkmmFailed
-	Goto NoAbort
-  InstallGtkmmFailed:
-	MessageBox MB_YESNO "Could not download gtkmm. gigedit won't work without gtkmm. Continue anyway?" IDYES NoAbort
-      Abort ;  causes installer to quit
-  NoAbort:
-FunctionEnd
+!macroend
+!insertmacro DetectSystemType ""
+!insertmacro DetectSystemType "un."
 
 ; Downloads and launches the JRE installer from the internet
 Function GetJRE
-        MessageBox MB_OK "JSampler requires Java ${JRE_VERSION}, it will now \
-                         be downloaded and installed"
+  Var /GLOBAL jreUri
 
-        StrCpy $2 "$TEMP\Java Runtime Environment.exe"
-        nsisdl::download /TIMEOUT=30000 ${JRE_URL} $2
-        Pop $R0 ;Get the return value
-                StrCmp $R0 "success" +3
-                MessageBox MB_OK "Download failed: $R0"
-                Quit
-        ExecWait $2
-        Delete $2
+  StrCmp $binType BIN_TYPE_64BIT 0 +3
+  StrCpy $jreUri ${JRE_64_URL}
+  Goto +2
+  StrCpy $jreUri ${JRE_32_URL}
+
+  DetailPrint "Downloading JRE from: $jreUri"
+
+  MessageBox MB_OK "JSampler requires Java ${JRE_VERSION} or later, \
+                    it will now be downloaded and installed"
+
+  StrCpy $2 "$TEMP\Java Runtime Environment.exe"
+  nsisdl::download /TIMEOUT=30000 "$jreUri" $2
+  Pop $R0  ; Get the return value
+  StrCmp $R0 "success" +3
+  MessageBox MB_OK "Download failed: $R0"
+  Quit
+  ExecWait $2
+  Delete $2
 FunctionEnd
 
 ; Checks if the JRE is already installed, if not it will download and install it from the internet
 Function DetectJRE
   ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
              "CurrentVersion"
-  StrCmp $2 ${JRE_VERSION} done
+  ${VersionCompare} $2 ${JRE_VERSION} $R0
+  IntCmp $R0 1 done done
+
+  StrCmp $binType BIN_TYPE_64BIT 0 downloadjre
 
+  ; on 64 bit systems also check the 32 bit view of the registry, maybe
+  ; a 32 bit JRE was already installed
+  SetRegView 32
+  ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
+             "CurrentVersion"
+  SetRegView 64  ; restore 64 bit view
+  ${VersionCompare} $3 ${JRE_VERSION} $R0
+  IntCmp $R0 1 done done
+
+  downloadjre:
   Call GetJRE
 
   done:
@@ -188,12 +204,45 @@
 ; Tries to find the location where VST plugins should be installed to
 Function DetectVstPath
   Var /GLOBAL vstPluginPath
+  Var /GLOBAL vstPluginPath64
+
+  StrCmp $binType BIN_TYPE_64BIT 0 detectVst32
+  SetRegView 64 ; make sure we have the 64 bit registry view
+
+  ; ------- VST 64 bit detection -------
+
+  ClearErrors
+  ReadRegStr $0 HKCU "Software\VST" "VSTPluginsPath"
+  IfErrors check2ndRegistryKey64 0
+  StrCpy $vstPluginPath64 $0
+  DetailPrint "Found VST plugin (64 bit) directory in HKCU registry."
+  Goto done64
+
+  check2ndRegistryKey64:
+  ClearErrors
+  ReadRegStr $0 HKLM "Software\VST" "VSTPluginsPath"
+  IfErrors noRegistryKeyExists64 0
+  StrCpy $vstPluginPath64 $0
+  DetailPrint "Found VST plugin (64 bit) directory in HKLM registry."
+  Goto done64
+
+  noRegistryKeyExists64:
+  ClearErrors
+  DetailPrint "No VST plugin directory (64 bit) defined in registry."
+  StrCpy $vstPluginPath64 "${DEFAULT_VST_DIR64}"
+
+  done64:
+  SetRegView 32 ; make sure we have a 32 bit registry view
+
+  detectVst32: ; it follows the same thing for the 32 bit registry view
+
+  ; ------- VST 32 bit detection -------
 
   ClearErrors
   ReadRegStr $0 HKCU "Software\VST" "VSTPluginsPath"
   IfErrors check2ndRegistryKey 0
   StrCpy $vstPluginPath $0
-  DetailPrint "Found VST plugin directory in HKCU registry."
+  DetailPrint "Found VST plugin (32 bit) directory in HKCU registry."
   Goto done
 
   check2ndRegistryKey:
@@ -201,35 +250,38 @@
   ReadRegStr $0 HKLM "Software\VST" "VSTPluginsPath"
   IfErrors noRegistryKeyExists 0
   StrCpy $vstPluginPath $0
-  DetailPrint "Found VST plugin directory in HKLM registry."
+  DetailPrint "Found VST plugin (32 bit) directory in HKLM registry."
   Goto done
 
   noRegistryKeyExists:
   ClearErrors
-  DetailPrint "No VST plugin directory defined in registry."
+  DetailPrint "No VST plugin directory (32 bit) defined in registry."
   StrCpy $vstPluginPath "${DEFAULT_VST_DIR}"
 
-  done:
-  DetailPrint "Using the following as VST plugin directory: $vstPluginPath"
+  done: ; ------- summary of detection -------
+
+  StrCmp $binType BIN_TYPE_64BIT 0 summaryVst32
+  SetRegView 64  ; restore 64 bit view
+  DetailPrint "Using the following as VST (64 bit) plugin directory: $vstPluginPath64"
+  summaryVst32:
+  DetailPrint "Using the following as VST (32 bit) plugin directory: $vstPluginPath"
 FunctionEnd
 
 ;--------------------------------
 
-; primer things to do
+; primer things to do (before installing, not called on uninstall)
 Section ""
+  Call DetectSystemType
   Call DetectVstPath
 SectionEnd
 
 ;--------------------------------
 
 ; The stuff to install
-Section "LinuxSampler 0.5.1.12cvs" SecLinuxSampler
+Section "LinuxSampler ${LINUXSAMPLER_VERSION}" SecLinuxSampler
   DetailPrint "Installing LinuxSampler binaries ..."
   StrCpy $installingLinuxSampler "1"
 
-  ; Set output path to the installation directory.
-  SetOutPath $INSTDIR
-
   StrCmp $binType BIN_TYPE_64BIT linuxsampler64
   StrCmp $binType BIN_TYPE_686SSE linuxsampler686sse
   Goto linuxsampler686
@@ -237,30 +289,41 @@
   ; Files to install
 
   linuxsampler64:
+  SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
   File bin\64\linuxsampler.exe
-  File bin\64\liblinuxsampler-1.dll
-  SetOutPath $vstPluginPath
-  File bin\64\LinuxSampler.dll
-  Goto done
+  File bin\64\liblinuxsampler-3.dll
+  File bin\64\libsqlite3-0.dll
+  SetOutPath $vstPluginPath64
+  File /oname=LinuxSampler64.dll bin\64\LinuxSampler.dll
+  MessageBox MB_YESNO \
+    "It seems you are using a 64 bit Windows system. A native 64 bit version of LinuxSampler and its VST plugin version will be installed accordingly.$\r$\n$\r$\nShall a 32 bit version of the LinuxSampler VST be installed as well?" \
+    IDNO done
+
+  ; so the other sections install their 32 bit versions as well
+  StrCpy $installing32BitToo "1"
 
   linuxsampler686sse:
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686sse\linuxsampler.exe
-  File bin\686sse\liblinuxsampler-1.dll
+  File bin\686sse\liblinuxsampler-3.dll
+  File bin\686\libsqlite3-0.dll
   SetOutPath $vstPluginPath
-  File bin\686sse\LinuxSampler.dll
+  File /oname=LinuxSampler32.dll bin\686sse\LinuxSampler.dll
   Goto done
 
   linuxsampler686:
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686\linuxsampler.exe
-  File bin\686\liblinuxsampler-1.dll
+  File bin\686\liblinuxsampler-3.dll
+  File bin\686\libsqlite3-0.dll
   SetOutPath $vstPluginPath
-  File bin\686\LinuxSampler.dll
+  File /oname=LinuxSampler32.dll bin\686\LinuxSampler.dll
   Goto done
 
   done:
 SectionEnd
 
-Section "JSampler 'Fantasia' 0.8a-cvs6" SecJSampler
+Section "JSampler 'Fantasia' ${FANTASIA_VERSION}" SecJSampler
   DetailPrint "Installing JSampler binaries ..."
   ; make sure JRE is installed
   Call DetectJRE
@@ -268,26 +331,31 @@
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Files to install
-  File bin\Fantasia-0.8a-cvs6.jar
+  File bin\Fantasia-0.9.jar
   File jsampler.ico
 SectionEnd
 
-Section "QSampler 0.2.1.26" SecQSampler
+Section "QSampler ${QSAMPLER_VERSION}" SecQSampler
   DetailPrint "Installing QSampler binaries ..."
   StrCpy $installingQSampler "1"
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Files to install
   File bin\686\qsampler.exe
+  File bin\686\liblscp-6.dll
   File bin\686\QtCore4.dll
   File bin\686\QtGui4.dll
   File bin\686\mingwm10.dll
+  File bin\686\libgcc_s_dw2-1.dll
   File qsampler.ico
   SetOutPath $INSTDIR\share\locale
   File bin\686\share\locale\qsampler_ru.qm
+  File bin\686\share\locale\qsampler_cs.qm
+  File bin\686\share\locale\qt_ru.qm
+  File bin\686\share\locale\qt_cs.qm
 SectionEnd
 
-Section "gigedit 0.1.1.x (cvs2009-05-10)" Secgigedit
+Section "gigedit ${GIGEDIT_VERSION}" Secgigedit
   DetailPrint "Installing gigedit binaries ..."
   StrCpy $installinggigedit "1"
 
@@ -296,9 +364,6 @@
   ; installer, so no check and no download necessary ATM)
   ;Call CheckForGtkmm
 
-  ; Set output path to the installation directory.
-  SetOutPath $INSTDIR
-
   StrCmp $binType BIN_TYPE_64BIT gigedit64
   ; I think we don't need a SSE optimized 32 bit binary for gigedit, one 64bit and one simple 32 bit version should be sufficient
   ;StrCmp $binType BIN_TYPE_686SSE gigedit686sse
@@ -307,15 +372,19 @@
   ; Files to install
 
   gigedit64:
+  SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
   File bin\64\gigedit.exe
-  File bin\64\libgigedit-1.dll
-  SetOutPath "$INSTDIR\plugins"
-  File bin\64\plugins\libgigeditlinuxsamplerplugin-1.dll
-  SetOutPath $INSTDIR
+  File bin\64\libgigedit-2.dll
+  SetOutPath "$INSTDIR\${SUBDIR_64_BIT}\plugins"
+  File bin\64\plugins\libgigeditlinuxsamplerplugin.dll
+  SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
   File bin\64\libatk-1.0-0.dll
   File bin\64\libatkmm-1.6-1.dll
   File bin\64\libcairo-2.dll
   File bin\64\libcairomm-1.0-1.dll
+  File bin\64\libexpat-1.dll
+  File bin\64\libfontconfig-1.dll
+  File bin\64\libfreetype-6.dll
   File bin\64\libgdkmm-2.4-1.dll
   File bin\64\libgdk_pixbuf-2.0-0.dll
   File bin\64\libgdk-win32-2.0-0.dll
@@ -329,35 +398,37 @@
   File bin\64\libgtkmm-2.4-1.dll
   File bin\64\libgtk-win32-2.0-0.dll
   File bin\64\libintl-8.dll
-  File bin\64\libjpeg-62.dll
   File bin\64\libpango-1.0-0.dll
   File bin\64\libpangocairo-1.0-0.dll
+  File bin\64\libpangoft2-1.0-0.dll
   File bin\64\libpangomm-1.4-1.dll
   File bin\64\libpangowin32-1.0-0.dll
-  File bin\64\libpng12-0.dll
+  File bin\64\libpng14-14.dll
   File bin\64\libsigc-2.0-0.dll
-  File bin\64\libtiff.dll
   File bin\64\zlib1.dll
-  SetOutPath $INSTDIR\etc\gtk-2.0
+  SetOutPath $INSTDIR\${SUBDIR_64_BIT}\etc\gtk-2.0
   File bin\64\etc\gtk-2.0\gtkrc
-  SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\engines
+  SetOutPath $INSTDIR\${SUBDIR_64_BIT}\lib\gtk-2.0\2.10.0\engines
   File bin\64\lib\gtk-2.0\2.10.0\engines\libwimp.dll
-  SetOutPath $INSTDIR\share\locale\de\LC_MESSAGES
+  SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\locale\de\LC_MESSAGES
   File bin\64\share\locale\de\LC_MESSAGES\gigedit.mo
   File bin\64\share\locale\de\LC_MESSAGES\gtk20.mo
-  SetOutPath $INSTDIR\share\locale\sv\LC_MESSAGES
+  SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\locale\sv\LC_MESSAGES
   File bin\64\share\locale\sv\LC_MESSAGES\gigedit.mo
   File bin\64\share\locale\sv\LC_MESSAGES\gtk20.mo
-  SetOutPath $INSTDIR\share\themes\MS-Windows\gtk-2.0
+  SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\themes\MS-Windows\gtk-2.0
   File bin\64\share\themes\MS-Windows\gtk-2.0\gtkrc
-  Goto done
+
+  ; shall we install the 32 bit version as well?
+  StrCmp $installing32BitToo "1" gigedit686 done
 
   gigedit686:
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686\gigedit.exe
-  File bin\686\libgigedit-1.dll
-  SetOutPath "$INSTDIR\plugins"
-  File bin\686\plugins\libgigeditlinuxsamplerplugin-1.dll
-  SetOutPath $INSTDIR
+  File bin\686\libgigedit-2.dll
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}\plugins"
+  File bin\686\plugins\libgigeditlinuxsamplerplugin.dll
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686\intl.dll
   File bin\686\jpeg62.dll
   File bin\686\libatk-1.0-0.dll
@@ -384,12 +455,12 @@
   File bin\686\libsigc-2.0-0.dll
   File bin\686\libtiff3.dll
   File bin\686\zlib1.dll
-  SetOutPath $INSTDIR\etc\gtk-2.0
+  SetOutPath $INSTDIR\${SUBDIR_32_BIT}\etc\gtk-2.0
   File bin\686\etc\gtk-2.0\gdk-pixbuf.loaders
   File bin\686\etc\gtk-2.0\gtkrc
-  SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\engines
+  SetOutPath $INSTDIR\${SUBDIR_32_BIT}\lib\gtk-2.0\2.10.0\engines
   File bin\686\lib\gtk-2.0\2.10.0\engines\libwimp.dll
-  SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\loaders
+  SetOutPath $INSTDIR\${SUBDIR_32_BIT}\lib\gtk-2.0\2.10.0\loaders
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-ani.dll
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-bmp.dll
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-gif.dll
@@ -405,25 +476,23 @@
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-wbmp.dll
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-xbm.dll
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-xpm.dll
-  SetOutPath $INSTDIR\share\locale\de\LC_MESSAGES
+  SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\locale\de\LC_MESSAGES
   File bin\686\share\locale\de\LC_MESSAGES\gigedit.mo
   File bin\686\share\locale\de\LC_MESSAGES\gtk20.mo
-  SetOutPath $INSTDIR\share\locale\sv\LC_MESSAGES
+  SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\locale\sv\LC_MESSAGES
   File bin\686\share\locale\sv\LC_MESSAGES\gigedit.mo
   File bin\686\share\locale\sv\LC_MESSAGES\gtk20.mo
-  SetOutPath $INSTDIR\share\themes\MS-Windows\gtk-2.0
+  SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\themes\MS-Windows\gtk-2.0
   File bin\686\share\themes\MS-Windows\gtk-2.0\gtkrc
   Goto done
 
   done:
 SectionEnd
 
-Section "libgig 3.2.1.x (cvs2009-05-03)" Seclibgig
+Section "libgig 3.3.0" Seclibgig
   DetailPrint "Installing libgig binaries ..."
   ; We make this a mandatory component
   SectionIn RO
-  ; Set output path to the installation directory.
-  SetOutPath $INSTDIR
 
   StrCmp $binType BIN_TYPE_64BIT libgig64
   StrCmp $binType BIN_TYPE_686SSE libgig686sse
@@ -432,29 +501,69 @@
   ; Files to install
 
   libgig64:
+  SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
   File bin\64\libgig-6.dll
+  File bin\64\libakai-0.dll
   File bin\64\rifftree.exe
   File bin\64\dlsdump.exe
   File bin\64\gigdump.exe
   File bin\64\gigextract.exe
-  ; special dependency for the 64 bit version
+  File bin\64\gigmerge.exe
+  File bin\64\gig2mono.exe
+  File bin\64\gig2stereo.exe
+  File bin\64\korg2gig.exe
+  File bin\64\korgdump.exe
+  File bin\64\akaidump.exe
+  File bin\64\akaiextract.exe
+  File bin\64\sf2dump.exe
+  ; special dependencies for the 64 bit version
   File bin\64\libgcc_s_sjlj-1.dll
+  File bin\64\libstdc++-6.dll
+
+  ; shall we install the 32 bit version as well?
+  StrCmp $installing32BitToo "1" libgig686sse
+  StrCmp $installingQSampler "1" libgigForQsampler done
+
+  ; QSampler needs the 32 bit libgig dll
+  libgigForQsampler:
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
+  File bin\686sse\libgig-6.dll
   Goto done
 
   libgig686sse:
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686sse\libgig-6.dll
+  File bin\686sse\libakai-0.dll
   File bin\686sse\rifftree.exe
   File bin\686sse\dlsdump.exe
   File bin\686sse\gigdump.exe
   File bin\686sse\gigextract.exe
+  File bin\686sse\gigmerge.exe
+  File bin\686sse\gig2mono.exe
+  File bin\686sse\gig2stereo.exe
+  File bin\686sse\korg2gig.exe
+  File bin\686sse\korgdump.exe
+  File bin\686sse\akaidump.exe
+  File bin\686sse\akaiextract.exe
+  File bin\686sse\sf2dump.exe
   Goto done
 
   libgig686:
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686\libgig-6.dll
+  File bin\686\libakai-0.dll
   File bin\686\rifftree.exe
   File bin\686\dlsdump.exe
   File bin\686\gigdump.exe
   File bin\686\gigextract.exe
+  File bin\686\gigmerge.exe
+  File bin\686\gig2mono.exe
+  File bin\686\gig2stereo.exe
+  File bin\686\korg2gig.exe
+  File bin\686\korgdump.exe
+  File bin\686\akaidump.exe
+  File bin\686\akaiextract.exe
+  File bin\686\sf2dump.exe
   Goto done
 
   done:
@@ -464,6 +573,8 @@
 
   ; Add LinuxSampler and friends to the system's PATH variable
   ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR"
+  ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\${SUBDIR_64_BIT}"
+  ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\${SUBDIR_32_BIT}"
 
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler" "DisplayName" "LinuxSampler ${RELEASE_DATE}"
@@ -474,18 +585,19 @@
 
   ; Store installation folders
   WriteRegStr HKLM "Software\LinuxSampler" "Main Directory" $INSTDIR
-  WriteRegStr HKLM "Software\LinuxSampler" "VST Directory" $vstPluginPath
+  StrCmp $binType BIN_TYPE_64BIT 0 +3
+  WriteRegStr HKLM "Software\LinuxSampler" "VST 64 Directory" $vstPluginPath64
+  StrCmp $installing32BitToo "1" 0 +2
+  WriteRegStr HKLM "Software\LinuxSampler" "VST 32 Directory" $vstPluginPath
 
   ; Just for info, store the release date as well
   WriteRegStr HKLM "Software\LinuxSampler" "Release Date" ${RELEASE_DATE}
 SectionEnd
 
-Section "libsndfile 1.0.19" Seclibsndfile
+Section "libsndfile ${SNDFILE_VERSION}" Seclibsndfile
   DetailPrint "Installing libsndfile binaries ..."
   ; We make this a mandatory component
   SectionIn RO
-  ; Set output path to the installation directory.
-  SetOutPath $INSTDIR
 
   StrCmp $binType BIN_TYPE_64BIT libsndfile64
   ; I think we don't need a SSE optimized 32 bit binary for libsndfile, one 64bit and one simple 32 bit DLL should be sufficient
@@ -495,36 +607,76 @@
   ; Files to install
 
   libsndfile64:
+  SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
   File bin\64\libsndfile-1.dll
-  Goto done
+  File bin\64\libFLAC-8.dll
+  File bin\64\libogg-0.dll
+  File bin\64\libvorbis-0.dll
+  File bin\64\libvorbisenc-2.dll
+
+  ; shall we install the 32 bit version as well?
+  StrCmp $installing32BitToo "1" libsndfile686 done
 
   libsndfile686:
+  SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686\libsndfile-1.dll
+  File bin\686\libFLAC-8.dll
+  File bin\686\libogg-0.dll
+  File bin\686\libvorbis-0.dll
+  File bin\686\libvorbisenc-2.dll
   Goto done
 
   done:
 SectionEnd
 
 Section "Start Menu Shortcuts" SecShortcuts
+  Var /GLOBAL javawbin
+  Var /GLOBAL samplerDir
+
+  StrCmp $binType BIN_TYPE_64BIT 0 +3
+  StrCpy $samplerDir "$INSTDIR\${SUBDIR_64_BIT}"
+  Goto +2
+  StrCpy $samplerDir "$INSTDIR\${SUBDIR_32_BIT}"
+
   ; Switch system variables to 'all users', to ensure we create the start
   ; menu shortcuts for all users and not just for the current user.
   SetShellVarContext all
 
+  ; try to resolve the full qualified path of the javaw binary
+  ClearErrors
+  SearchPath $javawbin javaw.exe
+  IfErrors 0 javawDetected
+  ClearErrors
+  ; if all fails, simply use SYSDIR (which should work almost always anyway)
+  DetailPrint "WRN: Could not resolve javaw.exe path, using SYSDIR."
+  StrCpy $javawbin "$SYSDIR\javaw.exe"
+  javawDetected:
+
   CreateDirectory "$SMPROGRAMS\LinuxSampler"
 
+  SetOutPath $INSTDIR
   CreateShortCut "$SMPROGRAMS\LinuxSampler\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
 
-  StrCmp $installingLinuxSampler '1' 0 +2
-  CreateShortCut "$SMPROGRAMS\LinuxSampler\LinuxSampler 0.5.1.12cvs (stand alone backend).lnk" "$INSTDIR\linuxsampler.exe" "" "$INSTDIR\linuxsampler.exe" 0
+  StrCmp $installingLinuxSampler '1' 0 +3
+  SetOutPath $samplerDir
+  CreateShortCut "$SMPROGRAMS\LinuxSampler\LinuxSampler ${LINUXSAMPLER_VERSION} (stand alone backend).lnk" "$samplerDir\linuxsampler.exe" "" "$samplerDir\linuxsampler.exe" 0
 
-  StrCmp $installingJSampler '1' 0 +2
-  CreateShortCut '$SMPROGRAMS\LinuxSampler\JSampler Fantasia 0.8a-cvs6 (frontend).lnk' 'javaw' '-jar "$INSTDIR\Fantasia-0.8a-cvs6.jar"' '$INSTDIR\jsampler.ico' 0
+  StrCmp $installingJSampler '1' 0 +3
+  SetOutPath $INSTDIR
+  CreateShortCut '$SMPROGRAMS\LinuxSampler\JSampler Fantasia ${FANTASIA_VERSION} (frontend).lnk' '$javawbin' '-jar "$INSTDIR\Fantasia-0.9.jar"' '$INSTDIR\jsampler.ico' 0
 
-  StrCmp $installingQSampler '1' 0 +2
-  CreateShortCut "$SMPROGRAMS\LinuxSampler\QSampler 0.2.1.26 (frontend).lnk" "$INSTDIR\qsampler.exe" "" "$INSTDIR\qsampler.ico" 0
+  StrCmp $installingQSampler '1' 0 +3
+  SetOutPath $INSTDIR
+  CreateShortCut "$SMPROGRAMS\LinuxSampler\QSampler ${QSAMPLER_VERSION} (frontend).lnk" "$INSTDIR\qsampler.exe" "" "$INSTDIR\qsampler.ico" 0
 
-  StrCmp $installinggigedit '1' 0 +2
-  CreateShortCut "$SMPROGRAMS\LinuxSampler\gigedit 0.1.1.x cvs2009-05-10 (stand alone).lnk" "$INSTDIR\gigedit.exe" "" "$INSTDIR\gigedit.exe" 0
+  StrCmp $installinggigedit '1' 0 +3
+  SetOutPath $samplerDir
+  CreateShortCut "$SMPROGRAMS\LinuxSampler\gigedit ${GIGEDIT_VERSION} (stand alone).lnk" "$samplerDir\gigedit.exe" "" "$samplerDir\gigedit.exe" 0
+
+  !insertmacro CreateInternetShortcut \
+  "$SMPROGRAMS\LinuxSampler\\Support LinuxSampler" \
+  "http://www.linuxsampler.org/donations.html" \
+  "" "0"
 SectionEnd
 
 ;--------------------------------
@@ -532,23 +684,37 @@
 ; Uninstaller
 
 Section "Uninstall"
-  Var /GLOBAL vstdir
+  Var /GLOBAL vstdir32
+  Var /GLOBAL vstdir64
+
+  Call un.DetectSystemType
 
-  DetailPrint "Removing LinuxSampler directory from PATH variable ..."
+  DetailPrint "Removing LinuxSampler directories from PATH variable ..."
   ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR"
+  ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\${SUBDIR_32_BIT}"
+  ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\${SUBDIR_64_BIT}"
 
-  DetailPrint "Searching for VST plugin ..."
+  StrCmp $binType BIN_TYPE_64BIT 0 uninstallVst32
+  DetailPrint "Searching for VST plugin (64 bit) ..."
   ClearErrors
-  ReadRegStr $0 HKLM "Software\LinuxSampler" "VST Directory"
-  IfErrors usedefaultvstdir 0
-  StrCpy $vstdir $0
-  DetailPrint "VST plugin location found in registry."
-  Goto vstdirDetected
-  usedefaultvstdir:
-  DetailPrint "WRN: No VST plugin location found in registry, trying default location."
+  ReadRegStr $0 HKLM "Software\LinuxSampler" "VST 64 Directory"
+  IfErrors uninstallVst32 0
+  StrCpy $vstdir64 $0
+  DetailPrint "Removing VST plugin (64 bit) from: $vstdir64 ..."
+  Delete "$vstdir64\LinuxSampler64.dll"
+
+  uninstallVst32:
+
+  DetailPrint "Searching for VST plugin (32 bit) ..."
+  ClearErrors
+  ReadRegStr $0 HKLM "Software\LinuxSampler" "VST 32 Directory"
+  IfErrors uninstallVstDone 0
+  StrCpy $vstdir32 $0
+  DetailPrint "Removing VST plugin (32 bit) from: $vstdir32 ..."
+  Delete "$vstdir32\LinuxSampler32.dll"
+
+  uninstallVstDone:
   ClearErrors
-  StrCpy $vstdir "${DEFAULT_VST_DIR}"
-  vstdirDetected:
 
   DetailPrint "Removing registry keys ..."
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LinuxSampler"
@@ -562,9 +728,6 @@
   DetailPrint "Removing shortcuts (if any) from: $SMPROGRAMS ..."
   Delete "$SMPROGRAMS\LinuxSampler\*.*"
 
-  DetailPrint "Removing VST plugin from: $vstdir ..."
-  Delete "$vstdir\LinuxSampler.dll"
-
   DetailPrint "Removing directories used ..."
   RMDir /r "$SMPROGRAMS\LinuxSampler"
   RMDir /r "$INSTDIR"