From 0bd741fec14681609cb6a7d88bc2ff0d91e6c702 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 7 Nov 2011 12:38:04 +0000
Subject: [PATCH] Generic installation path on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4573 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/JackPlatformPlug_os.h   | 2 +-
 windows/JackWinServerLaunch.cpp | 6 ------
 windows/Setup/jack.ci           | 2 +-
 windows/Setup/jack64.ci         | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/windows/JackPlatformPlug_os.h b/windows/JackPlatformPlug_os.h
index 0754111a..e2af7b45 100644
--- a/windows/JackPlatformPlug_os.h
+++ b/windows/JackPlatformPlug_os.h
@@ -25,7 +25,7 @@
 #define jack_client_dir "client"
 #define ADDON_DIR "jack"
 #define JACK_DEFAULT_DRIVER "portaudio"
-#define JACK_LOCATION "C:\Program Files\Jack v1.9.8"
+#define JACK_LOCATION "C:\Program Files\Jack"
 
 namespace Jack
 {
diff --git a/windows/JackWinServerLaunch.cpp b/windows/JackWinServerLaunch.cpp
index 041695a7..eb842fcb 100644
--- a/windows/JackWinServerLaunch.cpp
+++ b/windows/JackWinServerLaunch.cpp
@@ -19,12 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
-/*
-#ifndef JACK_LOCATION
-#include "config.h"
-#endif
-*/
-
 #include "JackChannel.h"
 #include "JackLibGlobals.h"
 #include "JackServerLaunch.h"
diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
index be4163f9..959c0dcf 100644
--- a/windows/Setup/jack.ci
+++ b/windows/Setup/jack.ci
@@ -3,7 +3,7 @@
    <output> .</>
    <exename> Jack_v1.9.8_32_setup.exe</>
    <digitsign> </>
-   <appname> Jack v1.9.8</>
+   <appname> Jack</>
    <password> </>
    <addlang> </>
    <icon> Default - 2</>
diff --git a/windows/Setup/jack64.ci b/windows/Setup/jack64.ci
index c56c7b8d..529facd1 100644
--- a/windows/Setup/jack64.ci
+++ b/windows/Setup/jack64.ci
@@ -3,7 +3,7 @@
    <output> .</>
    <exename> Jack_v1.9.8_64_setup.exe</>
    <digitsign> </>
-   <appname> Jack v1.9.8</>
+   <appname> Jack</>
    <password> </>
    <addlang> </>
    <icon> Default - 2</>