Update some Windows components

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4045 0c269be4-1314-0410-8aa9-9f06e86f4224

7 files changed, 225 insertions, 137 deletions

diff --git a/windows/Setup/JackRouter.dll b/windows/Setup/JackRouter.dll
index d74a2925..04d69ebd 100644
--- a/windows/Setup/JackRouter.dll
+++ b/windows/Setup/JackRouter.dll
diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index ad23c3bd..f10fce95 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -1,95 +1,98 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="jack_dummy" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Win32 Release">
-				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release\" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DSERVER_SIDE" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add directory="Release\bin" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Debug\" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DSERVER_SIDE" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add directory="Debug\bin" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Profiling">
-				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release\" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DJACK_MONITOR" />
-					<Add option="-DSERVER_SIDE" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add directory="Release\bin" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-		</Compiler>
-		<Linker>
-			<Add library="kernel32" />
-			<Add library="user32" />
-			<Add library="gdi32" />
-			<Add library="winspool" />
-			<Add library="comdlg32" />
-			<Add library="advapi32" />
-			<Add library="shell32" />
-			<Add library="ole32" />
-			<Add library="oleaut32" />
-			<Add library="uuid" />
-			<Add library="odbc32" />
-			<Add library="odbccp32" />
-			<Add library="libjackserver" />
-		</Linker>
-		<Unit filename="..\common\JackDummyDriver.cpp" />
-		<Extensions>
-			<AutoVersioning>
-				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
-				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
-			</AutoVersioning>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

+<CodeBlocks_project_file>

+	<FileVersion major="1" minor="6" />

+	<Project>

+		<Option title="jack_dummy" />

+		<Option pch_mode="2" />

+		<Option compiler="gcc" />

+		<Build>

+			<Target title="Win32 Release">

+				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />

+				<Option object_output="Release\" />

+				<Option type="3" />

+				<Option compiler="gcc" />

+				<Compiler>

+					<Add option="-O2" />

+					<Add option="-Wall" />

+					<Add option="-DBUILD_DLL" />

+					<Add option="-DSERVER_SIDE" />

+					<Add directory="..\windows" />

+					<Add directory="..\common\jack" />

+					<Add directory="..\common" />

+				</Compiler>

+				<Linker>

+					<Add directory="Release\bin" />

+				</Linker>

+			</Target>

+			<Target title="Win32 Debug">

+				<Option output="Debug\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />

+				<Option object_output="Debug\" />

+				<Option type="3" />

+				<Option compiler="gcc" />

+				<Compiler>

+					<Add option="-Wall" />

+					<Add option="-g" />

+					<Add option="-DBUILD_DLL" />

+					<Add option="-DSERVER_SIDE" />

+					<Add directory="..\windows" />

+					<Add directory="..\common\jack" />

+					<Add directory="..\common" />

+				</Compiler>

+				<Linker>

+					<Add directory="Debug\bin" />

+				</Linker>

+			</Target>

+			<Target title="Win32 Profiling">

+				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />

+				<Option object_output="Release\" />

+				<Option type="3" />

+				<Option compiler="gcc" />

+				<Compiler>

+					<Add option="-O2" />

+					<Add option="-Wall" />

+					<Add option="-DBUILD_DLL" />

+					<Add option="-DJACK_MONITOR" />

+					<Add option="-DSERVER_SIDE" />

+					<Add directory="..\windows" />

+					<Add directory="..\common\jack" />

+					<Add directory="..\common" />

+				</Compiler>

+				<Linker>

+					<Add directory="Release\bin" />

+				</Linker>

+			</Target>

+		</Build>

+		<Compiler>

+			<Add option="-Wall" />

+		</Compiler>

+		<Linker>

+			<Add library="kernel32" />

+			<Add library="user32" />

+			<Add library="gdi32" />

+			<Add library="winspool" />

+			<Add library="comdlg32" />

+			<Add library="advapi32" />

+			<Add library="shell32" />

+			<Add library="ole32" />

+			<Add library="oleaut32" />

+			<Add library="uuid" />

+			<Add library="odbc32" />

+			<Add library="odbccp32" />

+			<Add library="libjackserver" />

+		</Linker>

+		<Unit filename="jackdummydriver.rc">

+			<Option compilerVar="WINDRES" />

+		</Unit>

+		<Unit filename="..\common\JackDummyDriver.cpp" />

+		<Extensions>

+			<AutoVersioning>

+				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />

+				<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />

+				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />

+			</AutoVersioning>

+			<code_completion />

+			<envvars />

+			<debugger />

+		</Extensions>

+	</Project>

+</CodeBlocks_project_file>

diff --git a/windows/jack_loopback.cbp b/windows/jack_loopback.cbp
index 87edea4f..c9314e79 100644
--- a/windows/jack_loopback.cbp
+++ b/windows/jack_loopback.cbp
@@ -80,6 +80,9 @@
 			<Add library="odbccp32" />

 			<Add library="libjackserver" />

 		</Linker>

+		<Unit filename="jackloopbackdriver.rc">

+			<Option compilerVar="WINDRES" />

+		</Unit>

 		<Unit filename="..\common\JackLoopbackDriver.cpp" />

 		<Extensions>

 			<AutoVersioning>

diff --git a/windows/jackdummydriver.rc b/windows/jackdummydriver.rc
new file mode 100644
index 00000000..2d9ebe21
--- /dev/null
+++ b/windows/jackdummydriver.rc
@@ -0,0 +1,41 @@
+// Generated by ResEdit 1.4.3

+// Copyright (C) 2006-2008

+// http://www.resedit.net

+

+#include "resource.h"

+#include "afxres.h"

+

+

+//

+// Version Information resources

+//

+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT

+1 VERSIONINFO

+    FILEVERSION     1,9,6,0

+    PRODUCTVERSION  1,9,6,0

+    FILEOS          VOS_UNKNOWN

+    FILETYPE        VFT_DLL

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040c04b0"

+        BEGIN

+            VALUE "Comments", "\0"

+            VALUE "CompanyName", "Grame\0"

+            VALUE "FileDescription", "Jackmp Dummy Driver for Windows\0"

+            VALUE "FileVersion", "1, 9, 6, 0\0"

+            VALUE "InternalName", "jack_dummy\0"

+            VALUE "LegalCopyright", "Copyright Grame © 2006-2010\0"

+            VALUE "LegalTrademarks", "\0"

+            VALUE "OriginalFilename", "jack_dummy.dll\0"

+            VALUE "PrivateBuild", "\0"

+            VALUE "ProductName", "jack_dummy\0"

+            VALUE "ProductVersion", "1, 9, 6, 0\0"

+            VALUE "SpecialBuild", "\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 1036, 1200

+    END

+END

diff --git a/windows/jackloopbackdriver.rc b/windows/jackloopbackdriver.rc
new file mode 100644
index 00000000..f598b059
--- /dev/null
+++ b/windows/jackloopbackdriver.rc
@@ -0,0 +1,41 @@
+// Generated by ResEdit 1.4.3

+// Copyright (C) 2006-2008

+// http://www.resedit.net

+

+#include "resource.h"

+#include "afxres.h"

+

+

+//

+// Version Information resources

+//

+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT

+1 VERSIONINFO

+    FILEVERSION     1,9,6,0

+    PRODUCTVERSION  1,9,6,0

+    FILEOS          VOS_UNKNOWN

+    FILETYPE        VFT_DLL

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040c04b0"

+        BEGIN

+            VALUE "Comments", "\0"

+            VALUE "CompanyName", "Grame\0"

+            VALUE "FileDescription", "Jackmp Loopback Driver for Windows\0"

+            VALUE "FileVersion", "1, 9, 6, 0\0"

+            VALUE "InternalName", "jack_loopback\0"

+            VALUE "LegalCopyright", "Copyright Grame © 2006-2010\0"

+            VALUE "LegalTrademarks", "\0"

+            VALUE "OriginalFilename", "jack_loopback.dll\0"

+            VALUE "PrivateBuild", "\0"

+            VALUE "ProductName", "jack_loopback\0"

+            VALUE "ProductVersion", "1, 9, 6, 0\0"

+            VALUE "SpecialBuild", "\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 1036, 1200

+    END

+END

diff --git a/windows/jacknetonedriver.rc b/windows/jacknetonedriver.rc
index 9c184d36..48de1bec 100644
--- a/windows/jacknetonedriver.rc
+++ b/windows/jacknetonedriver.rc
@@ -1,41 +1,41 @@
-// Generated by ResEdit 1.4.3
-// Copyright (C) 2006-2008
-// http://www.resedit.net
-
-#include "resource.h"
-#include "afxres.h"
-
-
-//
-// Version Information resources
-//
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-1 VERSIONINFO
-    FILEVERSION     1,9,5,0
-    PRODUCTVERSION  1,9,5,0
-    FILEOS          VOS_UNKNOWN
-    FILETYPE        VFT_DLL
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Grame\0"
-            VALUE "FileDescription", "Jackmp NetOne Driver for Windows\0"
-            VALUE "FileVersion", "1, 9, 5, 0\0"
-            VALUE "InternalName", "jack_netonedriver\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2009\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "jack_netonedriver.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "jack_netonedriver\0"
-            VALUE "ProductVersion", "1, 9, 5, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 1036, 1200
-    END
-END
+// Generated by ResEdit 1.4.3

+// Copyright (C) 2006-2008

+// http://www.resedit.net

+

+#include "resource.h"

+#include "afxres.h"

+

+

+//

+// Version Information resources

+//

+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT

+1 VERSIONINFO

+    FILEVERSION     1,9,6,0

+    PRODUCTVERSION  1,9,6,0

+    FILEOS          VOS_UNKNOWN

+    FILETYPE        VFT_DLL

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040c04b0"

+        BEGIN

+            VALUE "Comments", "\0"

+            VALUE "CompanyName", "Grame\0"

+            VALUE "FileDescription", "Jackmp NetOne Driver for Windows\0"

+            VALUE "FileVersion", "1, 9, 6, 0\0"

+            VALUE "InternalName", "jack_netonedriver\0"

+            VALUE "LegalCopyright", "Copyright Grame © 2006-2010\0"

+            VALUE "LegalTrademarks", "\0"

+            VALUE "OriginalFilename", "jack_netonedriver.dll\0"

+            VALUE "PrivateBuild", "\0"

+            VALUE "ProductName", "jack_netonedriver\0"

+            VALUE "ProductVersion", "1, 9, 6, 0\0"

+            VALUE "SpecialBuild", "\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 1036, 1200

+    END

+END

diff --git a/windows/jackwinmme.rc b/windows/jackwinmme.rc
index a11da0d1..725acda9 100644
--- a/windows/jackwinmme.rc
+++ b/windows/jackwinmme.rc
@@ -22,7 +22,7 @@ BEGIN
         BEGIN

             VALUE "Comments", "\0"

             VALUE "CompanyName", "Grame\0"

-            VALUE "FileDescription", "Jackmp WinMMEo Driver for Windows\0"

+            VALUE "FileDescription", "Jackmp WinMME Driver for Windows\0"

             VALUE "FileVersion", "1, 9, 6, 0\0"

             VALUE "InternalName", "jack_portaudio\0"

             VALUE "LegalCopyright", "Copyright Grame © 2006-2010\0"