--- misc/trunk/win32_installer/linuxsampler_all.nsi	2012/08/31 04:21:23	2363
+++ misc/trunk/win32_installer/linuxsampler_all.nsi	2013/12/31 00:55:56	2485
@@ -1,6 +1,6 @@
 ; LinuxSampler Windows installer
 ;
-; Copyright (C) 2007-2012, The LinuxSampler Developers
+; Copyright (C) 2007-2013, The LinuxSampler Developers
 ;
 ; All-in-one Installer for all subprojects / software components of the
 ; LinuxSampler Project.
@@ -41,10 +41,10 @@
 
 ; Java Runtime Environment, needed for JSampler
 !define JRE_VERSION "1.6"
-; jre-7u7-windows-i586.exe:
-!define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=68242"
-; jre-7u7-windows-x64.exe:
-!define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=68243"
+; jre-7u45-windows-i586.exe:
+!define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=81819"
+; jre-7u45-windows-x64.exe:
+!define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=81821"
 
 ; The default installation directory
 InstallDir "$PROGRAMFILES64\LinuxSampler"
@@ -93,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-2012 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"
 
@@ -507,12 +507,21 @@
   File bin\64\dlsdump.exe
   File bin\64\gigdump.exe
   File bin\64\gigextract.exe
+  File bin\64\gigmerge.exe
+  File bin\64\gig2mono.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 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}"
@@ -521,6 +530,8 @@
   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
   Goto done
 
   libgig686:
@@ -530,6 +541,8 @@
   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
   Goto done
 
   done: