From d91cd42263559b0512ac0b3428d93b801e33067a Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 14 Nov 2011 15:09:55 +0000
Subject: [PATCH] Coorect Windows projects.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4585 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/jack_dummy.cbp        | 46 +++++++++++++--------------
 windows/jack_netdriver.cbp    | 42 ++++++++++++-------------
 windows/jack_netonedriver.cbp | 42 ++++++++++++-------------
 windows/jack_portaudio.cbp    | 58 +++++++++++++++++------------------
 windows/jack_winmme.cbp       |  4 +--
 windows/jackd.cbp             |  8 ++---
 windows/libjack.cbp           |  4 +--
 windows/libjacknet.cbp        |  4 +--
 windows/libjackserver.cbp     |  4 +--
 9 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index ccd3b488..c19d11e5 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -13,18 +13,18 @@
 				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
-					<Add option="-Wall" />
+					<Add option="-Wall" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release64\bin" />
-                   		 <Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,14 +37,14 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug64\bin" />
-                   		 <Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -54,19 +54,19 @@
 				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-O2" />
-					<Add option="-Wall" />
+					<Add option="-Wall" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release64\bin" />
-                    			<Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             		<Target title="Win32 Release 32bits">
@@ -77,21 +77,21 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                   			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-                   			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
-                    		<Add library="libjackserver" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -103,20 +103,20 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-                   		 <Add option="-m32" />
+                    <Add option="-m32" />
 					<Add directory="Debug\bin" />
-                    		<Add library="libjackserver" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackdummydriver.res jackdummydriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -128,22 +128,22 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                  			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add directory="Release\bin" />
-                    			<Add library="libjackserver" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
 				</ExtraCommands>
 			</Target>
diff --git a/windows/jack_netdriver.cbp b/windows/jack_netdriver.cbp
index 772ef688..02c9df6b 100644
--- a/windows/jack_netdriver.cbp
+++ b/windows/jack_netdriver.cbp
@@ -17,14 +17,14 @@
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release64\bin" />
-                    			<Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,14 +37,14 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug64\bin" />
-                    			<Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -59,14 +59,14 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release64\bin" />
-                    			<Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             		<Target title="Win32 Release 32bits">
@@ -77,21 +77,21 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
-                    			<Add option="-m32" />
-                    			<Add library="libjackserver" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -103,20 +103,20 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
-                   			<Add option="-m32" />
-                    			<Add library="libjackserver" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		 <ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetdriver.res jacknetdriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -128,22 +128,22 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
-                    			<Add option="-m32" />
-                    			<Add library="libjackserver" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
-                 		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
 				</ExtraCommands>
 			</Target>
diff --git a/windows/jack_netonedriver.cbp b/windows/jack_netonedriver.cbp
index 8a3bc9a1..d6608119 100644
--- a/windows/jack_netonedriver.cbp
+++ b/windows/jack_netonedriver.cbp
@@ -17,14 +17,14 @@
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release64\bin" />
-                   			<Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,14 +37,14 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug64\bin" />
-                   			<Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -59,14 +59,14 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release64\bin" />
-                    			<Add library="libjackserver64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             		<Target title="Win32 Release 32bits">
@@ -77,21 +77,21 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
-                    			<Add option="-m32" />
-                    			<Add library="libjackserver" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetonedriver.res jacknetonedriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -103,20 +103,20 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
-                    			<Add option="-m32" />
-                   			<Add library="libjackserver" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -128,22 +128,22 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
-                    			<Add option="-m32" />
-                    			<Add library="libjackserver" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
 				</ExtraCommands>
 			</Target>
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index 87b8a8d4..6aabbc17 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -22,7 +22,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                   			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -32,8 +32,8 @@
 				<Linker>
 					<Add directory="..\windows" />
 					<Add directory="Release64\bin" />
-                    			<Add library="libjackserver64" />
-                    			<Add library="portaudio_x86_64" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -46,12 +46,12 @@
 					<Add option="-g" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -61,8 +61,8 @@
 				<Linker>
 					<Add directory="Debug64\bin" />
 					<Add directory="..\windows" />
-                    			<Add library="libjackserver64" />
-                    			<Add library="portaudio_x86_64" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -82,7 +82,7 @@
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -92,8 +92,8 @@
 				<Linker>
 					<Add directory="Release64\bin" />
 					<Add directory="..\windows" />
-                    			<Add library="libjackserver64" />
-                    			<Add library="portaudio_x86_64" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
            		<Target title="Win32 Release 32bits">
@@ -104,7 +104,7 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
@@ -113,7 +113,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -123,11 +123,11 @@
 				<Linker>
 					<Add directory="..\windows" />
 					<Add directory="Release\bin" />
-                   			<Add option="-m32" />
-                    			<Add library="libjackserver" />
-                    			<Add library="portaudio_x86" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
 				</ExtraCommands>
 			</Target>
@@ -139,15 +139,15 @@
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -157,11 +157,11 @@
 				<Linker>
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
-                    			<Add option="-m32" />
-                    			<Add library="libjackserver" />
-                    			<Add library="portaudio_x86" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackportaudio.res jackportaudio.rc" />
 				</ExtraCommands>
 			</Target>
@@ -173,7 +173,7 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    			<Add option="-m32" />
+                    <Add option="-m32" />
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
@@ -183,7 +183,7 @@
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    			<Add option="-DJACK_32_64" />
+                    <Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -193,11 +193,11 @@
 				<Linker>
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
-                    			<Add option="-m32" />
-                    			<Add library="libjackserver" />
-                    			<Add library="portaudio_x86" />
+                    <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
-                		<ExtraCommands>
+                <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
 				</ExtraCommands>
 			</Target>
diff --git a/windows/jack_winmme.cbp b/windows/jack_winmme.cbp
index 1d46d508..c2ac74c3 100644
--- a/windows/jack_winmme.cbp
+++ b/windows/jack_winmme.cbp
@@ -43,7 +43,7 @@
 					<Add option="-g" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DSERVER_SIDE" />
@@ -131,7 +131,7 @@
                     <Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DSERVER_SIDE" />
diff --git a/windows/jackd.cbp b/windows/jackd.cbp
index 1b0cd86e..f7ca1129 100644
--- a/windows/jackd.cbp
+++ b/windows/jackd.cbp
@@ -19,7 +19,7 @@
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
-					<Add option="-D_CONSOLE" />
+					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -67,7 +67,7 @@
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
-					<Add option="-D_CONSOLE" />
+					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
@@ -94,7 +94,7 @@
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
-					<Add option="-D_CONSOLE" />
+					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -152,7 +152,7 @@
 					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
-					<Add option="-D_CONSOLE" />
+					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
diff --git a/windows/libjack.cbp b/windows/libjack.cbp
index ec35cd62..d3a1cd1b 100644
--- a/windows/libjack.cbp
+++ b/windows/libjack.cbp
@@ -62,7 +62,7 @@
 					<Add option="-g" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DLIBJACKMP_EXPORTS" />
@@ -201,7 +201,7 @@
 					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DLIBJACKMP_EXPORTS" />
diff --git a/windows/libjacknet.cbp b/windows/libjacknet.cbp
index cb14f243..762880f6 100644
--- a/windows/libjacknet.cbp
+++ b/windows/libjacknet.cbp
@@ -49,7 +49,7 @@
 					<Add option="-g" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DLIBJACKDMP_EXPORTS" />
@@ -149,7 +149,7 @@
 					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DLIBJACKDMP_EXPORTS" />
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index a320be89..4cd86297 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -53,7 +53,7 @@
 					<Add option="-g" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DLIBJACKDMP_EXPORTS" />
@@ -164,7 +164,7 @@
 					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
+					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DLIBJACKDMP_EXPORTS" />