From 7f6ef9f6448d912c221210da6e4dca247fce3e12 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 23 Jan 2012 17:03:12 +0000
Subject: [PATCH] Correct debug target on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4726 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackDebugClient.cpp | 4 ++++
 windows/jackd.workspace    | 4 ++--
 windows/libjack.cbp        | 4 ++++
 windows/libjackserver.cbp  | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/common/JackDebugClient.cpp b/common/JackDebugClient.cpp
index 3b0af9b4..ce33737f 100644
--- a/common/JackDebugClient.cpp
+++ b/common/JackDebugClient.cpp
@@ -115,7 +115,11 @@ int JackDebugClient::Close()
 
 void JackDebugClient::CheckClient(const char* function_name) const
 {
+#ifdef WIN32
+    *fStream << "CheckClient : " << function_name << ", calling thread : " << GetCurrentThread() << endl;
+#else
     *fStream << "CheckClient : " << function_name << ", calling thread : " << pthread_self() << endl;
+#endif
 
     if (fIsClosed > 0)  {
         *fStream << "!!! ERROR !!! : Accessing a client '" << fClientName << "' already closed " << "from " << function_name << endl;
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index 76b2906f..12b959c5 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -3,7 +3,7 @@
 	<Workspace title="jack">
 		<Project filename="libjack.cbp" />
 		<Project filename="libjacknet.cbp" />
-		<Project filename="libjackserver.cbp" active="1" />
+		<Project filename="libjackserver.cbp" />
 		<Project filename="jack_portaudio.cbp" />
 		<Project filename="jack_netdriver.cbp" />
 		<Project filename="jack_netonedriver.cbp" />
@@ -13,7 +13,7 @@
 		<Project filename="jack_load.cbp" />
 		<Project filename="jack_unload.cbp" />
 		<Project filename="jack_lsp.cbp" />
-		<Project filename="jack_latent_client.cbp" />
+		<Project filename="jack_latent_client.cbp" active="1" />
 		<Project filename="jack_metro.cbp" />
 		<Project filename="jack_connect.cbp" />
 		<Project filename="jack_disconnect.cbp" />
diff --git a/windows/libjack.cbp b/windows/libjack.cbp
index 6727053e..74a2e278 100644
--- a/windows/libjack.cbp
+++ b/windows/libjack.cbp
@@ -304,6 +304,10 @@
 		<Unit filename="..\common\JackAudioPort.cpp" />
 		<Unit filename="..\common\JackClient.cpp" />
 		<Unit filename="..\common\JackConnectionManager.cpp" />
+		<Unit filename="..\common\JackDebugClient.cpp">
+			<Option target="Win32 Debug 64bits" />
+			<Option target="Win32 Debug 32bits" />
+		</Unit>
 		<Unit filename="..\common\JackEngineControl.cpp" />
 		<Unit filename="..\common\JackEngineProfiling.cpp">
 			<Option target="Win32 Profiling" />
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index 90f808c6..cf79513a 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -251,6 +251,10 @@
 		<Unit filename="..\common\JackClient.cpp" />
 		<Unit filename="..\common\JackConnectionManager.cpp" />
 		<Unit filename="..\common\JackControlAPI.cpp" />
+		<Unit filename="..\common\JackDebugClient.cpp">
+			<Option target="Win32 Debug 64bits" />
+			<Option target="Win32 Debug 32bits" />
+		</Unit>
 		<Unit filename="..\common\JackDriver.cpp" />
 		<Unit filename="..\common\JackDriverLoader.cpp" />
 		<Unit filename="..\common\JackEngine.cpp" />