From 0cb4e351eebd889a4a20068bebe700e7aeec0349 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 19 Apr 2011 10:49:06 +0000
Subject: [PATCH] Update libjacknet Windows project.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4329 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                                     |   3 +-
 common/JackNetTool.cpp                        |   4 +-
 .../iPhoneNet.xcodeproj/project.pbxproj       |   7 ++
 windows/libjacknet.cbp                        | 107 +++++++++++++++++-
 windows/libjacknet.rc                         |  10 +-
 5 files changed, 119 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60b40651..31928bb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ Mario Lang
 Arnold Krille
 Jan Engelhardt
 Adrian Knoth
+David Garcia Garzon
 Valerio Pilo
 
 ---------------------------
@@ -106,7 +107,7 @@ Valerio Pilo
 
 	* jack_client_has_session_callback implementation.
 	* Fix jdelay for new latency API.
-	* Check requested buffer size and limit to 1..8192 - avoids wierd behaviour caused by jack_bufsize foobar.
+	* Check requested buffer size and limit to 1..8192 - avoids weird behaviour caused by jack_bufsize foobar.
 	* jack_port_type_get_buffer_size implementation.
 	* Stop using alloca and allocate buffer on the heap for alsa_io.
 	* Rename jdelay to jack_iodelay as per Fons' request.
diff --git a/common/JackNetTool.cpp b/common/JackNetTool.cpp
index bd79beba..43179844 100644
--- a/common/JackNetTool.cpp
+++ b/common/JackNetTool.cpp
@@ -393,7 +393,7 @@ namespace Jack
 #if HAVE_CELT_API_0_8 || HAVE_CELT_API_0_11
             int res = celt_encode_float(fCeltEncoder[port_index], floatbuf, fPeriodSize, fCompressedBuffer[port_index], fCompressedSizeByte);
 #else
-	    int res = celt_encode_float(fCeltEncoder[port_index], floatbuf, NULL, fCompressedBuffer[port_index], fCompressedSizeByte);
+            int res = celt_encode_float(fCeltEncoder[port_index], floatbuf, NULL, fCompressedBuffer[port_index], fCompressedSizeByte);
 #endif
             if (res != fCompressedSizeByte) {
                 jack_error("celt_encode_float error fCompressedSizeByte = %d  res = %d", fCompressedSizeByte, res);
@@ -409,7 +409,7 @@ namespace Jack
 #if HAVE_CELT_API_0_8 || HAVE_CELT_API_0_11
             int res = celt_decode_float(fCeltDecoder[port_index], fCompressedBuffer[port_index], fCompressedSizeByte, fPortBuffer[port_index], fPeriodSize );
 #else
-	    int res = celt_decode_float(fCeltDecoder[port_index], fCompressedBuffer[port_index], fCompressedSizeByte, fPortBuffer[port_index]);
+            int res = celt_decode_float(fCeltDecoder[port_index], fCompressedBuffer[port_index], fCompressedSizeByte, fPortBuffer[port_index]);
 #endif
             if (res != CELT_OK) {
                 jack_error("celt_decode_float error res = %d", fCompressedSizeByte, res);
diff --git a/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj b/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj
index eff06935..56bc518a 100755
--- a/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj
+++ b/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj
@@ -527,7 +527,14 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iPhoneNet" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
 			projectRoot = "";
diff --git a/windows/libjacknet.cbp b/windows/libjacknet.cbp
index 18b88c61..3d890ca4 100644
--- a/windows/libjacknet.cbp
+++ b/windows/libjacknet.cbp
@@ -6,7 +6,98 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Win32 Release">
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DLIBJACKDMP_EXPORTS" />
+					<Add option="-DREGEX_MALLOC" />
+					<Add option="-DSTDC_HEADERS" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-D__SMP__" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+					<Add library="libsamplerate_x86_64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DLIBJACKDMP_EXPORTS" />
+					<Add option="-DREGEX_MALLOC" />
+					<Add option="-DSTDC_HEADERS" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-D__SMP__" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Debug64\bin" />
+					<Add library="libsamplerate_x86_64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+					<Add option="-D_MBCS" />
+					<Add option="-D_USRDLL" />
+					<Add option="-DLIBJACKDMP_EXPORTS" />
+					<Add option="-DREGEX_MALLOC" />
+					<Add option="-DSTDC_HEADERS" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-D__SMP__" />
+					<Add option="-DJACK_MONITOR" />
+					<Add directory="." />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add directory="Release64\bin" />
+					<Add library="libsamplerate_x86_64" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Release 32bits">
 				<Option output="Release\bin\libjacknet" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
@@ -16,6 +107,7 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -32,10 +124,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
 					<Add directory="Release\bin" />
+					<Add library="libsamplerate_x86" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Debug">
+			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\libjacknet" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug" />
 				<Option type="3" />
@@ -45,6 +139,7 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -61,10 +156,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
 					<Add directory="Debug\bin" />
+					<Add library="libsamplerate_x86" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Profiling">
+			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\libjacknet" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
@@ -74,6 +171,7 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -91,7 +189,9 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
 					<Add directory="Release\bin" />
+					<Add library="libsamplerate_x86" />
 				</Linker>
 			</Target>
 		</Build>
@@ -115,7 +215,6 @@
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
 			<Add library="ws2_32" />
-			<Add library="libsamplerate-0" />
 		</Linker>
 		<Unit filename="..\common\JackAudioAdapterInterface.cpp" />
 		<Unit filename="..\common\JackGlobals.cpp" />
diff --git a/windows/libjacknet.rc b/windows/libjacknet.rc
index b6e11113..7431af9b 100644
--- a/windows/libjacknet.rc
+++ b/windows/libjacknet.rc
@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,3,0
-    PRODUCTVERSION  1,9,3,0
+    FILEVERSION     1,9,8,0
+    PRODUCTVERSION  1,9,8,0
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jack Net library for Windows\0"
-            VALUE "FileVersion", "1, 9, 3, 0\0"
+            VALUE "FileVersion", "1, 9, 8, 0\0"
             VALUE "InternalName", "libjacknet\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2009\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libjacknet.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "libjacknet\0"
-            VALUE "ProductVersion", "1, 9, 3, 0\0"
+            VALUE "ProductVersion", "1, 9, 8, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END