From e522c4f29f8ae28d06ee3d74bb019dc1da20112c Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Wed, 6 Apr 2011 10:59:49 +0000
Subject: [PATCH] Correct 64/32 bits version of libjackserver.cbp

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

diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index c424a7b4..8d491b3c 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="jack">
-		<Project filename="libjackserver.cbp" />
+		<Project filename="libjackserver.cbp" active="1" />
 		<Project filename="jackd.cbp">
 			<Depends filename="libjackserver.cbp" />
 		</Project>
@@ -56,7 +56,7 @@
 		<Project filename="multiple_metro.cbp">
 			<Depends filename="libjack.cbp" />
 		</Project>
-		<Project filename="jack_winmme.cbp" active="1" />
+		<Project filename="jack_winmme.cbp" />
 		<Project filename="jack_loopback.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index 82628a70..6b4fb15e 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -6,7 +6,7 @@
 		<Option pch_mode="2" />
 		<Option compiler="mingw_64" />
 		<Build>
-            <Target title="Win32 Release 64bits">
+			<Target title="Win32 Release 64bits">
 				<Option output="Release\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
@@ -78,9 +78,9 @@
 				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
-                    <Add option="-m32" />
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -100,8 +100,12 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
 					<Add directory="Release\bin" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/libjackserver.res libjackserver.rc" />
+				</ExtraCommands>
 			</Target>
 			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\libjackserver" prefix_auto="1" extension_auto="1" />
@@ -111,9 +115,9 @@
 				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
-                    <Add option="-m32" />
 					<Add option="-Wall" />
 					<Add option="-g" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -133,8 +137,12 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
 					<Add directory="Debug\bin" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/libjackserver.res libjackserver.rc" />
+				</ExtraCommands>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\libjackserver" prefix_auto="1" extension_auto="1" />
@@ -144,9 +152,9 @@
 				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
-                    <Add option="-m32" />
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -167,8 +175,12 @@
 					<Add directory="tre-0.8.0\lib" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
 					<Add directory="Release\bin" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/libjackserver.res libjackserver.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>