--- misc/trunk/win32_installer/linuxsampler_all.nsi	2015/11/20 17:34:28	2853
+++ misc/trunk/win32_installer/linuxsampler_all.nsi	2016/10/20 19:11:53	3019
@@ -1,6 +1,6 @@
 ; LinuxSampler Windows installer
 ;
-; Copyright (C) 2007-2015, The LinuxSampler Developers
+; Copyright (C) 2007-2016, The LinuxSampler Developers
 ;
 ; All-in-one Installer for all subprojects / software components of the
 ; LinuxSampler Project.
@@ -40,10 +40,11 @@
 OutFile "linuxsampler_${RELEASE_DATE}_setup.exe"
 
 ; Java Runtime Environment, needed for JSampler
-; jre-8u66-windows-i586.exe:
-!define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=113217"
-; jre-8u66-windows-x64.exe:
-!define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=113219"
+!define JRE_VERSION "1.6"
+; jre-8u111-windows-i586.exe:
+!define JRE_32_URL "http://javadl.oracle.com/webapps/download/AutoDL?BundleId=216432"
+; jre-8u111-windows-x64.exe:
+!define JRE_64_URL "http://javadl.oracle.com/webapps/download/AutoDL?BundleId=216434"
 
 ; The default installation directory
 InstallDir "$PROGRAMFILES64\LinuxSampler"
@@ -92,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-2015 The LinuxSampler Project"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2016 The LinuxSampler Project"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"
 
@@ -342,11 +343,28 @@
   ; 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 bin\686\Qt5Core.dll
+  File bin\686\Qt5Gui.dll
+  File bin\686\Qt5Widgets.dll
+  File bin\686\libbz2-1.dll
+  File bin\686\libfreetype-6.dll
+  File bin\686\libglib-2.0-0.dll
+  File bin\686\libgraphite2.dll
+  File bin\686\libharfbuzz-0.dll
+  File bin\686\libiconv-2.dll
+  File bin\686\libicudt57.dll
+  File bin\686\libicuin57.dll
+  File bin\686\libicuuc57.dll
+  File bin\686\libintl-8.dll
+  File bin\686\liblscp-6.dll
+  File bin\686\libpcre-1.dll
+  File bin\686\libpcre16-0.dll
+  File bin\686\libpng16-16.dll
+  File bin\686\zlib1.dll
+  File qt.conf
   File qsampler.ico
+  SetOutPath $INSTDIR\plugins\platforms
+  File bin\686\plugins\platforms\qwindows.dll
   SetOutPath $INSTDIR\share\locale
   File bin\686\share\locale\qsampler_ru.qm
   File bin\686\share\locale\qsampler_cs.qm
@@ -439,7 +457,7 @@
   File bin\686\libgdk-win32-2.0-0.dll
   File bin\686\libgio-2.0-0.dll
   File bin\686\libgiomm-2.4-1.dll
-  File bin\686\libglib-2.0-0.dll
+  ; File bin\686\libglib-2.0-0.dll
   File bin\686\libglibmm-2.4-1.dll
   File bin\686\libgmodule-2.0-0.dll
   File bin\686\libgobject-2.0-0.dll
@@ -453,7 +471,7 @@
   File bin\686\libpng12-0.dll
   File bin\686\libsigc-2.0-0.dll
   File bin\686\libtiff3.dll
-  File bin\686\zlib1.dll
+  ; File bin\686\zlib1.dll
   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
@@ -516,7 +534,6 @@
   File bin\64\akaiextract.exe
   File bin\64\sf2dump.exe
   File bin\64\sf2extract.exe
-  ; special dependencies for the 64 bit version
   File bin\64\libgcc_s_sjlj-1.dll
   File bin\64\libstdc++-6.dll
 
@@ -528,7 +545,7 @@
   libgigForQsampler:
   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686sse\libgig-7.dll
-  Goto done
+  Goto libgig32common
 
   libgig686sse:
   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
@@ -547,7 +564,7 @@
   File bin\686sse\akaiextract.exe
   File bin\686sse\sf2dump.exe
   File bin\686sse\sf2extract.exe
-  Goto done
+  Goto libgig32common
 
   libgig686:
   SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
@@ -566,8 +583,12 @@
   File bin\686\akaiextract.exe
   File bin\686\sf2dump.exe
   File bin\686\sf2extract.exe
-  Goto done
 
+  libgig32common:
+  File bin\686\libgcc_s_dw2-1.dll
+  File bin\686\libwinpthread-1.dll  
+  File bin\686\libstdc++-6.dll
+  
   done:
 
   ; As this is a mandatory component, we misuse is for the following
@@ -626,6 +647,7 @@
   File bin\686\libogg-0.dll
   File bin\686\libvorbis-0.dll
   File bin\686\libvorbisenc-2.dll
+  File bin\686\libspeex-1.dll
   Goto done
 
   done: