From 458d007a75ee57c00b9336f432b385a7749b4d5d Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Wed, 13 Apr 2011 13:48:19 +0000
Subject: [PATCH] Correct Windows installers.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4299 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/Setup/jack.ci               |   7 ++++---
 windows/Setup/jack64.ci             |  10 ++++++----
 windows/Setup/src/gpl_installer.rtf | Bin 862 -> 1001 bytes
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
index 2d6712d3..9fe7b2db 100644
--- a/windows/Setup/jack.ci
+++ b/windows/Setup/jack.ci
@@ -54,7 +54,8 @@
    <bgback> </>
    <files listview >
       <_><src>..\Release\bin\libjack.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\vcredist_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\vcredist_2008_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\vcredist_2010_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libjack.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libjack.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libjackserver.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
@@ -107,8 +108,8 @@
 
    </files>
    <runx listview >
-      <_><type>app</><path>inst</><file>vcredist_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
-
+   <_><type>app</><path>inst</><file>vcredist_2008_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+   <_><type>app</><path>inst</><file>vcredist_2010_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
    </runx>
    <registry listview >
       
diff --git a/windows/Setup/jack64.ci b/windows/Setup/jack64.ci
index 2e102878..5a1d5c62 100644
--- a/windows/Setup/jack64.ci
+++ b/windows/Setup/jack64.ci
@@ -53,8 +53,9 @@
    <bgfoot> </> 
    <bgback> </>
    <files listview >
-      <_><src>.\src\vcredist_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-	  <_><src>.\src\vcredist_x64.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+      <_><src>.\src\vcredist_2008_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+	  <_><src>.\src\vcredist_2010_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+	  <_><src>.\src\vcredist_2010_x64.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjack64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjack64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\libjack64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
@@ -118,8 +119,9 @@
 
    </files>
    <runx listview >
-      <_><type>app</><path>inst</><file>vcredist_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
-	  <_><type>app</><path>inst</><file>vcredist_x64.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+   <_><type>app</><path>inst</><file>vcredist_2008_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+   <_><type>app</><path>inst</><file>vcredist_2010_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+   <_><type>app</><path>inst</><file>vcredist_2010_x64.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
    </runx>
    <registry listview >
       
diff --git a/windows/Setup/src/gpl_installer.rtf b/windows/Setup/src/gpl_installer.rtf
index cc8bcb4ed44920425b6df55c657aa7f058284e4e..fac711f5b791f8179e8bb515a43b451bd3809618 100644
GIT binary patch
delta 217
zcmaLOF$%&k6aY{WQBa&6EshRt63CzhH$hQE+=LHO+oTpgX-QH#gy0!^6tCbx+`Wb3
z0bJhpUj6rA;y_zTAyKCIkybfnoV6o9O-n4by<!l978!wD3!w;Hu@;Q;xQ(X+MnlHQ
zqD?McN*_<#y*rSFz|6rMBxZ#&)@{zm^=ZF7?1I_N+G-g^P1A(As>4#}5f-UXMwn>k
j{WoK#4O#~^LMmzSFL>`k5|D<GU=>1@=<%@U$HUGCYgkJF

delta 81
zcmaFKevgg2I;N;3%`hf0uQ+p}xaq_KDRx6sJwsCi^NADVnG7s8ekx(o$S5f(u+rBr
lFE7_i&nwl-FG|<X$xKeoD^4xex6_L$NG#&zs^#Tk004cJ8r%Q?