--- misc/trunk/win32_installer/linuxsampler_all.nsi	2011/10/30 17:14:27	2281
+++ misc/trunk/win32_installer/linuxsampler_all.nsi	2013/09/12 05:29:42	2469
@@ -1,6 +1,6 @@
 ; LinuxSampler Windows installer
 ;
-; Copyright (C) 2007-2011, The LinuxSampler Developers
+; Copyright (C) 2007-2013, The LinuxSampler Developers
 ;
 ; All-in-one Installer for all subprojects / software components of the
 ; LinuxSampler Project.
@@ -23,6 +23,7 @@
 ;Include Modern UI
 !include "MUI.nsh"
 !include "EnvVarUpdate.nsh"
+!include "WordFunc.nsh"
 
 !define /date RELEASE_DATE "%Y%m%d"
 !searchparse /file bin/686/linuxsampler.pc `Version: ` LINUXSAMPLER_VERSION
@@ -40,8 +41,10 @@
 
 ; Java Runtime Environment, needed for JSampler
 !define JRE_VERSION "1.6"
-!define JRE_32_URL "http://download.oracle.com/otn-pub/java/jdk/6u29-b11/jre-6u29-windows-i586.exe"
-!define JRE_64_URL "http://download.oracle.com/otn-pub/java/jdk/6u29-b11/jre-6u29-windows-x64.exe"
+; jre-7u40-windows-i586.exe:
+!define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=80812"
+; jre-7u40-windows-x64.exe:
+!define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=80814"
 
 ; The default installation directory
 InstallDir "$PROGRAMFILES64\LinuxSampler"
@@ -90,7 +93,7 @@
 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-2011 The LinuxSampler Project"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2013 The LinuxSampler Project"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"
 
@@ -161,8 +164,8 @@
 
   DetailPrint "Downloading JRE from: $jreUri"
 
-  MessageBox MB_OK "JSampler requires Java ${JRE_VERSION}, it will now \
-                    be downloaded and installed"
+  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
@@ -178,7 +181,8 @@
 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
 
@@ -188,7 +192,8 @@
   ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" \
              "CurrentVersion"
   SetRegView 64  ; restore 64 bit view
-  StrCmp $3 ${JRE_VERSION} done
+  ${VersionCompare} $3 ${JRE_VERSION} $R0
+  IntCmp $R0 1 done done
 
   downloadjre:
   Call GetJRE
@@ -507,7 +512,14 @@
   File bin\64\libstdc++-6.dll
 
   ; shall we install the 32 bit version as well?
-  StrCmp $installing32BitToo "1" libgig686sse done
+  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}"