From cbc5f4f26550523aecaeedfff00aea5733325f75 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Wed, 15 Jul 2009 08:07:14 +0000
Subject: [PATCH] Include Microsoft Visual C++ 2008 Redistributable Package in
 Windows installer.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3597 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/Setup/README     |  6 +++++-
 windows/Setup/jack.ci    |  9 ++++++---
 windows/Setup/src/README | 15 +++++++++------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/windows/Setup/README b/windows/Setup/README
index d7f7eaf4..78588ece 100644
--- a/windows/Setup/README
+++ b/windows/Setup/README
@@ -1,7 +1,11 @@
 This folder contains a script to create an installer for windows.
 It uses 'CreateInstall Free'(http://www.createinstall.com), a little software allowing to make simple installers.
 
-You can use the 'jack.ci' script to make the installer. For that, you need to build the Code::Blocks workspace in order to have '.exe' and libraries. You also need 'qjackctl' binaries and libraries ('qjackctl.exe', 'mingwm10.dll', 'QtCore4.dll', 'QtGui.dll' and 'QtXml4.dll'). You can recompile qjackctl with qt4 or directly get the binaries. The five files are expected in the 'qjackctl' folder.
+You can use the 'jack.ci' script to make the installer. For that, you need to build the Code::Blocks workspace in order to have '.exe' and libraries. 
+You also need 'qjackctl' binaries and libraries ('qjackctl.exe', 'mingwm10.dll', 'QtCore4.dll', 'QtGui.dll' and 'QtXml4.dll'). 
+You can recompile qjackctl with qt4 or directly get the binaries. The five files are expected in the 'qjackctl' folder.
+
+You also need the Microsoft Visual C++ 2008 Redistributable Package (x86) (the vcrdist_x86.exe file) to be in src folder.
 
 If you need libjack.lib and libjackserver.lib to link with in MS Visual Studio, you can use the MS Tool lib.exe to create the .lib file from de .def.
 Just use : 'lib /DEF:libjackserver.def /OUT:libjackserver.lib' and 'lib /DEF:libjack.def /OUT:libjack.lib' to create the lib file.
diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
index 213bcc82..b37f4deb 100644
--- a/windows/Setup/jack.ci
+++ b/windows/Setup/jack.ci
@@ -1,5 +1,5 @@
 <*project
-      version = 4 civer = "Free v4.14.3" winver = "2.6/5.1.2600" > 
+      version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" > 
    <output> .</>
    <exename> Jack_v1.9.3_setup.exe</>
    <digitsign> </>
@@ -38,7 +38,7 @@
    <srcfolder> </>
    <ifexist> over</>
    <runafter> </>
-   <runconfirm> 0</>
+   <runconfirm> 1</>
    <uninclude> 1</>
    <unicon> Uninstall - 2</>
    <unshortcut> 1</>
@@ -54,6 +54,7 @@
    <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>..\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</></>
@@ -72,6 +73,7 @@
 <_><src>..\Release\bin\portaudio_x86.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack\jack_net.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack\jack_dummy.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\jack\jack_winmme.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack\jack_portaudio.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack\netmanager.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack\audioadapter.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
@@ -99,7 +101,8 @@
 
    </files>
    <runx listview >
-      
+      <_><type>app</><path>inst</><file>vcredist_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+
    </runx>
    <registry listview >
       
diff --git a/windows/Setup/src/README b/windows/Setup/src/README
index 5421e5e7..e9424a26 100644
--- a/windows/Setup/src/README
+++ b/windows/Setup/src/README
@@ -3,7 +3,7 @@ JACK on Windows
 =============================================
 
 This installer will install everything to use Jack Audio Connection Kit (JACK) (www.jackaudio.org) on Windows.
-
+
 
 =============================================
 QJACKCTL on Windows
@@ -30,14 +30,17 @@ Alternatively using the following command allows to display the names of availab
 
 Then start jackd with the device you want, by using its name, for example:
 
-- jackd -R -S -d portaudio -d "ASIO::MOTU Audio ASIO", then start qjackctl. qjackctl will see the jackd server already running and then can be used normally.
-
-
+- jackd -R -S -d portaudio -d "ASIO::MOTU Audio ASIO", then start qjackctl. qjackctl will see the jackd server already running and then can be used normally.
+
+
 =============================================
 Jack MIDI
 =============================================
-
-A first version of a JACK MIDI <==> Windows MIDI bridge (using Windows MME API) is available. If can be activated using the -X parameter in jackd command line. So add "-X winmme" in QJACKCTL settings (somathing like "jackd -S -X winmme"). The WinMME driver will scan MIDI input/output ports, open corresponding JACK MIDI ports and convert MIDI in/out into JACK MIDI messages. QJACKCTL MIDI connection windows can then be used.
+
+A first version of a JACK MIDI <==> Windows MIDI bridge (using Windows MME API) is available. 
+If can be activated using the -X parameter in jackd command line. So add "-X winmme" in QJACKCTL settings (something like "jackd -S -X winmme"). 
+The WinMME driver will scan MIDI input/output ports, open corresponding JACK MIDI ports and convert MIDI in/out into JACK MIDI messages. 
+QJACKCTL MIDI connection windows can then be used.
 
 
 =============================================