From 0cd5d18ecea39b318ec6a93370ca41a64c8c7a95 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 8 Sep 2008 10:34:10 +0000
Subject: [PATCH] Compile and link again on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2893 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/JackCompilerDeps_os.h |  6 +++---
 windows/jack_audioadapter.cbp |  2 +-
 windows/jack_portaudio.cbp    |  2 +-
 windows/jackd.workspace       | 18 ++----------------
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/windows/JackCompilerDeps_os.h b/windows/JackCompilerDeps_os.h
index e639e899..6d90cc9d 100644
--- a/windows/JackCompilerDeps_os.h
+++ b/windows/JackCompilerDeps_os.h
@@ -21,9 +21,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackCompilerDeps_WIN32__
 
 #if __GNUC__
-	#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
-	#define	EXPORT __attribute__ ((visibility("default")))
-#else 
+	#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
+	#define	EXPORT __declspec(dllexport)
+#else
 	//#define MEM_ALIGN(x,y) __declspec(align(y)) x
 	#define MEM_ALIGN(x,y) x
 	#define	EXPORT __declspec(dllexport)
diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index 81d25feb..d6d0b707 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -81,9 +81,9 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="portaudio_x86" />
 			<Add library="libsamplerate-0" />
 			<Add library="libjackservermp" />
+			<Add library="portaudio_x86" />
 		</Linker>
 		<Unit filename="..\common\JackAudioAdapter.cpp" />
 		<Unit filename="..\common\JackAudioAdapterFactory.cpp" />
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index 5aa35646..ed7dc6c7 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -99,8 +99,8 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="portaudio_x86" />
 			<Add library="libjackservermp" />
+			<Add library="portaudio_x86" />
 		</Linker>
 		<Unit filename="jackportaudio.rc">
 			<Option compilerVar="WINDRES" />
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index 3fe26ba5..0897d380 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -1,59 +1,45 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="jack">
-		<Project filename="libjackserver.cbp" active="1" />
+		<Project filename="libjackserver.cbp" />
 		<Project filename="jackd.cbp">
 			<Depends filename="libjackserver.cbp" />
 		</Project>
-		<Project filename="jack_portaudio.cbp">
+		<Project filename="jack_portaudio.cbp" active="1">
 			<Depends filename="libjackserver.cbp" />
-			<Depends filename="jackd.cbp" />
 		</Project>
 		<Project filename="jack_netdriver.cbp">
 			<Depends filename="libjackserver.cbp" />
-			<Depends filename="jackd.cbp" />
 		</Project>
 		<Project filename="jack_dummy.cbp">
 			<Depends filename="libjackserver.cbp" />
-			<Depends filename="jackd.cbp" />
 		</Project>
 		<Project filename="jack_netmanager.cbp">
 			<Depends filename="libjackserver.cbp" />
-			<Depends filename="jackd.cbp" />
-			<Depends filename="jack_netdriver.cbp" />
-			<Depends filename="jack_netadapter.cbp" />
 		</Project>
 		<Project filename="jack_audioadapter.cbp">
 			<Depends filename="libjackserver.cbp" />
-			<Depends filename="jackd.cbp" />
 		</Project>
 		<Project filename="jack_netadapter.cbp">
 			<Depends filename="libjackserver.cbp" />
-			<Depends filename="jackd.cbp" />
 		</Project>
 		<Project filename="libjack.cbp" />
 		<Project filename="jack_load.cbp">
-			<Depends filename="jackd.cbp" />
 			<Depends filename="libjack.cbp" />
 		</Project>
 		<Project filename="jack_unload.cbp">
-			<Depends filename="jackd.cbp" />
 			<Depends filename="libjack.cbp" />
 		</Project>
 		<Project filename="jack_lsp.cbp">
-			<Depends filename="jackd.cbp" />
 			<Depends filename="libjack.cbp" />
 		</Project>
 		<Project filename="jack_metro.cbp">
-			<Depends filename="jackd.cbp" />
 			<Depends filename="libjack.cbp" />
 		</Project>
 		<Project filename="jack_connect.cbp">
-			<Depends filename="jackd.cbp" />
 			<Depends filename="libjack.cbp" />
 		</Project>
 		<Project filename="jack_disconnect.cbp">
-			<Depends filename="jackd.cbp" />
 			<Depends filename="libjack.cbp" />
 		</Project>
 	</Workspace>