OSDN Git Service

(root) / tortoisegit / TortoiseGitJp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 95153df)
Build Libapr and libaprutil successfully
authorFrank Li <lznuaa@gmail.com>
Sun, 5 Apr 2009 04:18:33 +0000 (12:18 +0800)
committerFrank Li <lznuaa@gmail.com>
Sun, 5 Apr 2009 04:18:33 +0000 (12:18 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
ext/apr patch | blob | history
ext/apr-util patch | blob | history
ext/build/libapr.vcproj patch | blob | history
ext/build/libaprutil.vcproj patch | blob | history
src/TortoiseGit.sln patch | blob | history
src/TortoiseMerge/AppUtils.cpp patch | blob | history
src/TortoiseMerge/AppUtils.h patch | blob | history
src/TortoiseMerge/FilePatchesDlg.cpp patch | blob | history
src/TortoiseMerge/MainFrm.cpp patch | blob | history

diff --git a/ext/apr b/ext/apr
index e6e6e68..4853979 160000 (submodule)
--- a/ext/apr
+++ b/ext/apr
@@ -1 +1 @@
-Subproject commit e6e6e68656d99ef0583536fbd8671367df38c288
+Subproject commit 48539798dcea5a2669e59bc8036910cb3a294c13
diff --git a/ext/apr-util b/ext/apr-util
index 446e923..4516f0f 160000 (submodule)
--- a/ext/apr-util
+++ b/ext/apr-util
@@ -1 +1 @@
-Subproject commit 446e923ab6dbd90bfe6c0050b920c0cedc37d140
+Subproject commit 4516f0fa784254e88e1a4bc0721bd5ba054d3251
diff --git a/ext/build/libapr.vcproj b/ext/build/libapr.vcproj
index eb77803..2c54c8a 100644 (file)
--- a/ext/build/libapr.vcproj
+++ b/ext/build/libapr.vcproj
@@ -81,7 +81,7 @@
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="Release\libapr-1.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                BaseAddress="0x6EEC0000"\r
@@ -180,7 +180,7 @@
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="NT\Debug\libapr-1.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"\r
                                SubSystem="2"\r
                                BaseAddress="0x6EEC0000"\r
                                RandomizedBaseAddress="1"\r
@@ -378,7 +378,7 @@
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="NT\Release\libapr-1.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                BaseAddress="0x6EEC0000"\r
diff --git a/ext/build/libaprutil.vcproj b/ext/build/libaprutil.vcproj
index f501efa..de2d7ed 100644 (file)
--- a/ext/build/libaprutil.vcproj
+++ b/ext/build/libaprutil.vcproj
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="9.00"\r
        Name="libaprutil"\r
-       ProjectGUID="{D755A309-64A2-45A9-8751-1A2A82CE257A}"\r
+       ProjectGUID="{6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}"\r
        TargetFrameworkVersion="0"\r
        >\r
        <Platforms>\r
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="type apu.hw &gt;..\apr-util\include\apu.hw"\r
+                               CommandLine="type apu.hw &gt;..\apr-util\include\apu.hw "\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -80,12 +80,12 @@
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)\libapr-tsvn.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"\r
                                SubSystem="2"\r
                                BaseAddress="0x6EE60000"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               ImportLibrary="$(OutDir)\libaprutil-tsvn.lib"\r
+                               ImportLibrary="$(OutDir)\libaprutil_tsvn.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -124,7 +124,6 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="type apu.hw &gt;..\apr-util\include\apu.hw"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -181,13 +180,13 @@
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)\libapr-tsvn.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                BaseAddress="0x6EE60000"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               ImportLibrary="$(OutDir)\libaprutil-tsvn.lib"\r
+                               ImportLibrary="$(OutDir)\libaprutil_tsvn.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -850,7 +849,6 @@
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
-                                               ExcludedFromBuild="true"\r
                                                >\r
                                                <Tool\r
                                                        Name="VCCLCompilerTool"\r
@@ -860,7 +858,6 @@
                                        </FileConfiguration>\r
                                        <FileConfiguration\r
                                                Name="Release|Win32"\r
-                                               ExcludedFromBuild="true"\r
                                                >\r
                                                <Tool\r
                                                        Name="VCCLCompilerTool"\r
@@ -874,7 +871,6 @@
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
-                                               ExcludedFromBuild="true"\r
                                                >\r
                                                <Tool\r
                                                        Name="VCCLCompilerTool"\r
@@ -884,7 +880,6 @@
                                        </FileConfiguration>\r
                                        <FileConfiguration\r
                                                Name="Release|Win32"\r
-                                               ExcludedFromBuild="true"\r
                                                >\r
                                                <Tool\r
                                                        Name="VCCLCompilerTool"\r
diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index d1e5661..10f3eb5 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -1,6 +1,6 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual Studio 2008\r
+# Visual C++ Express 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Git", "Git\Git.vcproj", "{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseProc", "TortoiseProc\TortoiseProc.vcproj", "{50797F06-39C5-4802-8E2B-7B7A4EF03214}"\r
@@ -78,161 +78,617 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseLangs", "..\Languag
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SshAskPass", "SshAskPass\SshAskPass.vcproj", "{E8C01071-3B47-4A3F-9168-AA58A4635638}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseMerge", "TortoiseMerge\TortoiseMerge.vcproj", "{8ABB4F84-891A-4748-8507-F5494842173E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\ext\build\xml.vcproj", "{AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\ext\build\libapr.vcproj", "{4472028D-4ACF-474E-AA95-9B7E12B50F60}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "..\ext\build\libaprutil.vcproj", "{6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60} = {4472028D-4ACF-474E-AA95-9B7E12B50F60}\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE} = {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               debug_static|Win32 = debug_static|Win32\r
+               debug_static|x64 = debug_static|x64\r
                Debug|Win32 = Debug|Win32\r
                Debug|x64 = Debug|x64\r
+               Debug9x|Win32 = Debug9x|Win32\r
+               Debug9x|x64 = Debug9x|x64\r
+               DebugNT|Win32 = DebugNT|Win32\r
+               DebugNT|x64 = DebugNT|x64\r
+               release_static|Win32 = release_static|Win32\r
+               release_static|x64 = release_static|x64\r
                Release|Win32 = Release|Win32\r
                Release|x64 = Release|x64\r
+               Release9x|Win32 = Release9x|Win32\r
+               Release9x|x64 = Release9x|x64\r
+               ReleaseNT|Win32 = ReleaseNT|Win32\r
+               ReleaseNT|x64 = ReleaseNT|x64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x64.Build.0 = Debug|x64\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.Build.0 = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.ActiveCfg = Debug|x64\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.Build.0 = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug9x|x64.Build.0 = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.DebugNT|x64.Build.0 = Debug|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.ActiveCfg = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.ActiveCfg = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.Build.0 = Release|x64\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|x64\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.Build.0 = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release9x|x64.ActiveCfg = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release9x|x64.Build.0 = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x64.Build.0 = Debug|x64\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.Build.0 = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.ActiveCfg = Debug|x64\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.Build.0 = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug9x|x64.Build.0 = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.DebugNT|x64.Build.0 = Debug|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x64.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x64.Build.0 = Release|x64\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|x64\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.Build.0 = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release9x|x64.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release9x|x64.Build.0 = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.Build.0 = Debug|x64\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.Build.0 = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.ActiveCfg = Debug|x64\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.Build.0 = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug9x|x64.Build.0 = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.DebugNT|x64.Build.0 = Debug|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.ActiveCfg = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.ActiveCfg = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.Build.0 = Release|x64\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.Build.0 = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.ActiveCfg = Release|x64\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.Build.0 = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release9x|x64.ActiveCfg = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release9x|x64.Build.0 = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.Build.0 = Debug|x64\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.Build.0 = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.ActiveCfg = Debug|x64\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.Build.0 = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug9x|x64.Build.0 = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.DebugNT|x64.Build.0 = Debug|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.ActiveCfg = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.ActiveCfg = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.Build.0 = Release|x64\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.ActiveCfg = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.Build.0 = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.ActiveCfg = Release|x64\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.Build.0 = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release9x|x64.ActiveCfg = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release9x|x64.Build.0 = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x64.Build.0 = Debug|x64\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.Build.0 = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.ActiveCfg = Debug|x64\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.Build.0 = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug9x|x64.Build.0 = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.DebugNT|x64.Build.0 = Debug|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x64.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x64.Build.0 = Release|x64\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|x64\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.Build.0 = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release9x|x64.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release9x|x64.Build.0 = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.Build.0 = Debug|x64\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.Build.0 = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.ActiveCfg = Debug|x64\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.Build.0 = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug9x|x64.Build.0 = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.DebugNT|x64.Build.0 = Debug|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.ActiveCfg = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.ActiveCfg = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.Build.0 = Release|x64\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.Build.0 = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.ActiveCfg = Release|x64\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.Build.0 = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release9x|x64.ActiveCfg = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release9x|x64.Build.0 = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.Build.0 = Debug|x64\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.Build.0 = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.ActiveCfg = Debug|x64\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.Build.0 = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug9x|x64.Build.0 = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.DebugNT|x64.Build.0 = Debug|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.ActiveCfg = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.ActiveCfg = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.Build.0 = Release|x64\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.ActiveCfg = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.Build.0 = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.ActiveCfg = Release|x64\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.Build.0 = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release9x|x64.ActiveCfg = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release9x|x64.Build.0 = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.Build.0 = Debug|x64\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.Build.0 = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.ActiveCfg = Debug|x64\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.Build.0 = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Debug9x|x64.Build.0 = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.DebugNT|x64.Build.0 = Debug|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.ActiveCfg = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.ActiveCfg = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.Build.0 = Release|x64\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.ActiveCfg = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.Build.0 = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.ActiveCfg = Release|x64\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.Build.0 = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Release9x|x64.ActiveCfg = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Release9x|x64.Build.0 = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.ActiveCfg = Debug|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Win32.ActiveCfg = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Win32.Build.0 = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x64.ActiveCfg = Debug|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x64.Build.0 = Debug|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Win32.ActiveCfg = Release|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x64.ActiveCfg = Release|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Win32.ActiveCfg = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Win32.Build.0 = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x64.ActiveCfg = Release|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x64.Build.0 = Release|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release9x|x64.ActiveCfg = Release|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x64.Build.0 = Debug|x64\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.Build.0 = Debug|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.ActiveCfg = Debug|x64\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.Build.0 = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug9x|x64.Build.0 = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.DebugNT|x64.Build.0 = Debug|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.Build.0 = Release|x64\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.ActiveCfg = Release|x64\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.Build.0 = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release9x|x64.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release9x|x64.Build.0 = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.ActiveCfg = Debug|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.ActiveCfg = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.Build.0 = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.ActiveCfg = Release|x64\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.Build.0 = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug9x|Win32.ActiveCfg = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug9x|Win32.Build.0 = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug9x|x64.ActiveCfg = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.DebugNT|Win32.ActiveCfg = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.DebugNT|Win32.Build.0 = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.DebugNT|x64.ActiveCfg = Debug|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Win32.ActiveCfg = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.ActiveCfg = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.Build.0 = Release|x64\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.ActiveCfg = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.Build.0 = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.ActiveCfg = Release|x64\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.Build.0 = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release9x|x64.ActiveCfg = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release9x|x64.Build.0 = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.Build.0 = Debug|x64\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.Build.0 = Debug|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.ActiveCfg = Debug|x64\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.Build.0 = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug9x|x64.Build.0 = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.DebugNT|x64.Build.0 = Debug|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Win32.ActiveCfg = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.ActiveCfg = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.Build.0 = Release|x64\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.ActiveCfg = Release|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.Build.0 = Release|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.ActiveCfg = Release|x64\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.Build.0 = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release9x|x64.ActiveCfg = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release9x|x64.Build.0 = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|x64.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|x64.Build.0 = Release|x64\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Win32.ActiveCfg = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Win32.Build.0 = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|x64.ActiveCfg = Release|x64\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|x64.Build.0 = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug9x|Win32.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug9x|x64.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug9x|x64.Build.0 = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.DebugNT|Win32.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.DebugNT|x64.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.DebugNT|x64.Build.0 = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Win32.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|x64.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|x64.Build.0 = Release|x64\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Win32.ActiveCfg = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Win32.Build.0 = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.ActiveCfg = Release|x64\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.Build.0 = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release9x|x64.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release9x|x64.Build.0 = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.Build.0 = Debug|x64\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.Build.0 = Debug|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|x64\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.Build.0 = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug9x|x64.Build.0 = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.DebugNT|x64.Build.0 = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.Build.0 = Release|x64\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|x64\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.Build.0 = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release9x|x64.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release9x|x64.Build.0 = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|x64.Build.0 = Debug|x64\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.Build.0 = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.ActiveCfg = Debug|x64\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.Build.0 = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug9x|x64.Build.0 = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.DebugNT|x64.Build.0 = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Win32.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|x64.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|x64.Build.0 = Release|x64\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.Build.0 = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|x64\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.Build.0 = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release9x|x64.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release9x|x64.Build.0 = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Win32.ActiveCfg = debug_static|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Win32.Build.0 = debug_static|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|x64.ActiveCfg = debug_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.Build.0 = Debug|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|x64\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug9x|x64.Build.0 = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.DebugNT|x64.Build.0 = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.ActiveCfg = release_static|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.Build.0 = release_static|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|x64.ActiveCfg = release_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Win32.ActiveCfg = Release|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Win32.Build.0 = Release|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.ActiveCfg = Release|x64\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.Build.0 = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release9x|x64.ActiveCfg = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release9x|x64.Build.0 = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|x64.Build.0 = Debug|x64\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Win32.Build.0 = Debug|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|x64.ActiveCfg = Debug|x64\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|x64.Build.0 = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug9x|x64.Build.0 = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.DebugNT|x64.Build.0 = Debug|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|Win32.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|x64.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|x64.Build.0 = Release|x64\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release9x|x64.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release9x|x64.Build.0 = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Win32.ActiveCfg = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|x64.ActiveCfg = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|x64.Build.0 = Debug|x64\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Win32.Build.0 = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|x64.ActiveCfg = Debug|x64\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|x64.Build.0 = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug9x|Win32.ActiveCfg = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug9x|x64.ActiveCfg = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug9x|x64.Build.0 = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.DebugNT|Win32.ActiveCfg = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.DebugNT|x64.ActiveCfg = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.DebugNT|x64.Build.0 = Debug|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|Win32.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|x64.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|x64.Build.0 = Release|x64\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Win32.ActiveCfg = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Win32.Build.0 = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x64.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release9x|x64.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release9x|x64.Build.0 = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.debug_static|x64.ActiveCfg = Debug|Win32\r
                {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|Win32.Build.0 = Debug|Win32\r
                {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug9x|Win32.ActiveCfg = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug9x|Win32.Build.0 = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.Debug9x|x64.ActiveCfg = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.DebugNT|Win32.ActiveCfg = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.DebugNT|Win32.Build.0 = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.DebugNT|x64.ActiveCfg = Debug|Win32\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.release_static|Win32.ActiveCfg = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.release_static|x64.ActiveCfg = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.release_static|x64.Build.0 = Release|x64\r
                {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|Win32.ActiveCfg = Release|Win32\r
                {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|Win32.Build.0 = Release|Win32\r
                {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release|x64.ActiveCfg = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release9x|Win32.ActiveCfg = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release9x|x64.ActiveCfg = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.Release9x|x64.Build.0 = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.ReleaseNT|Win32.ActiveCfg = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.ReleaseNT|x64.ActiveCfg = Release|x64\r
+               {E8C01071-3B47-4A3F-9168-AA58A4635638}.ReleaseNT|x64.Build.0 = Release|x64\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.Build.0 = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|x64.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug9x|Win32.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug9x|Win32.Build.0 = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug9x|x64.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.DebugNT|Win32.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.DebugNT|Win32.Build.0 = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.DebugNT|x64.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.Build.0 = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|x64.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.Build.0 = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|x64.ActiveCfg = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release9x|Win32.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release9x|Win32.Build.0 = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release9x|x64.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.ReleaseNT|Win32.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.ReleaseNT|Win32.Build.0 = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.ReleaseNT|x64.ActiveCfg = release_static|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.debug_static|x64.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug9x|Win32.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug9x|Win32.Build.0 = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Debug9x|x64.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.DebugNT|Win32.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.DebugNT|Win32.Build.0 = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.DebugNT|x64.ActiveCfg = Debug|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.release_static|Win32.Build.0 = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.release_static|x64.ActiveCfg = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|Win32.Build.0 = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release|x64.ActiveCfg = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release9x|Win32.ActiveCfg = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release9x|Win32.Build.0 = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.Release9x|x64.ActiveCfg = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.ReleaseNT|Win32.ActiveCfg = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.ReleaseNT|Win32.Build.0 = Release|Win32\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}.ReleaseNT|x64.ActiveCfg = Release|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.debug_static|x64.ActiveCfg = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug9x|Win32.ActiveCfg = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug9x|Win32.Build.0 = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Debug9x|x64.ActiveCfg = Debug|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.DebugNT|Win32.ActiveCfg = DebugNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.DebugNT|Win32.Build.0 = DebugNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.DebugNT|x64.ActiveCfg = DebugNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.release_static|Win32.ActiveCfg = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.release_static|Win32.Build.0 = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.release_static|x64.ActiveCfg = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|Win32.Build.0 = Release|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release|x64.ActiveCfg = Release|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release9x|Win32.ActiveCfg = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release9x|Win32.Build.0 = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.Release9x|x64.ActiveCfg = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.ReleaseNT|Win32.ActiveCfg = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.ReleaseNT|Win32.Build.0 = ReleaseNT|Win32\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60}.ReleaseNT|x64.ActiveCfg = ReleaseNT|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.debug_static|x64.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug9x|Win32.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug9x|Win32.Build.0 = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Debug9x|x64.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.DebugNT|Win32.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.DebugNT|Win32.Build.0 = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.DebugNT|x64.ActiveCfg = Debug|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.release_static|Win32.Build.0 = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.release_static|x64.ActiveCfg = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|Win32.Build.0 = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release|x64.ActiveCfg = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release9x|Win32.ActiveCfg = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release9x|Win32.Build.0 = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.Release9x|x64.ActiveCfg = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.ReleaseNT|Win32.ActiveCfg = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.ReleaseNT|Win32.Build.0 = Release|Win32\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}.ReleaseNT|x64.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/src/TortoiseMerge/AppUtils.cpp b/src/TortoiseMerge/AppUtils.cpp
index 87fcde2..2780b21 100644 (file)
--- a/src/TortoiseMerge/AppUtils.cpp
+++ b/src/TortoiseMerge/AppUtils.cpp
@@ -20,7 +20,7 @@
 #include "Registry.h"\r
 #include "AppUtils.h"\r
 #include "UnicodeUtils.h"\r
-#include "ProgressDlg.h"\r
+#include "SysProgressDlg.h"\r
 \r
 //#include "svn_pools.h"\r
 //#include "svn_io.h"\r
@@ -37,7 +37,7 @@ CAppUtils::~CAppUtils(void)
 {\r
 }\r
 \r
-BOOL CAppUtils::GetVersionedFile(CString sPath, CString sVersion, CString sSavePath, CProgressDlg * progDlg, HWND hWnd /*=NULL*/)\r
+BOOL CAppUtils::GetVersionedFile(CString sPath, CString sVersion, CString sSavePath, CSysProgressDlg * progDlg, HWND hWnd /*=NULL*/)\r
 {\r
        CString sSCMPath = CRegString(_T("Software\\TortoiseMerge\\SCMPath"), _T(""));\r
        if (sSCMPath.IsEmpty())\r
diff --git a/src/TortoiseMerge/AppUtils.h b/src/TortoiseMerge/AppUtils.h
index a545cb7..2e7bf40 100644 (file)
--- a/src/TortoiseMerge/AppUtils.h
+++ b/src/TortoiseMerge/AppUtils.h
@@ -20,7 +20,7 @@
 //#include "svn_types.h"\r
 #include "GitStatus.h"\r
 \r
-class CProgressDlg;\r
+class CSysProgressDlg;\r
 \r
 /**\r
  * \ingroup TortoiseMerge\r
@@ -41,7 +41,7 @@ public:
         * \param hWnd the window handle of the calling app\r
         * \return TRUE if successful\r
         */\r
-       static BOOL GetVersionedFile(CString sPath, CString sVersion, CString sSavePath, CProgressDlg * progDlg, HWND hWnd = NULL);\r
+       static BOOL GetVersionedFile(CString sPath, CString sVersion, CString sSavePath, CSysProgressDlg * progDlg, HWND hWnd = NULL);\r
        \r
        /**\r
         * Creates a unified diff from two files\r
diff --git a/src/TortoiseMerge/FilePatchesDlg.cpp b/src/TortoiseMerge/FilePatchesDlg.cpp
index 4fe95cf..0c9c245 100644 (file)
--- a/src/TortoiseMerge/FilePatchesDlg.cpp
+++ b/src/TortoiseMerge/FilePatchesDlg.cpp
@@ -22,7 +22,7 @@
 #include "Patch.h"\r
 #include "AppUtils.h"\r
 #include "PathUtils.h"\r
-#include "ProgressDlg.h"\r
+#include "SysProgressDlg.h"\r
 \r
 \r
 IMPLEMENT_DYNAMIC(CFilePatchesDlg, CDialog)\r
@@ -326,7 +326,7 @@ void CFilePatchesDlg::OnNMRclickFilelist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
                        {\r
                                if (m_pCallBack)\r
                                {\r
-                                       CProgressDlg progDlg;\r
+                                       CSysProgressDlg progDlg;\r
                                        progDlg.SetTitle(IDR_MAINFRAME);\r
                                        progDlg.SetShowProgressBar(true);\r
                                        progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PATCH_ALL)));\r
@@ -349,7 +349,7 @@ void CFilePatchesDlg::OnNMRclickFilelist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
                        {\r
                                if (m_pCallBack)\r
                                {\r
-                                       CProgressDlg progDlg;\r
+                                       CSysProgressDlg progDlg;\r
                                        progDlg.SetTitle(IDR_MAINFRAME);\r
                                        progDlg.SetShowProgressBar(true);\r
                                        progDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PATCH_SELECTED)));\r
diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp
index cd2bd3d..aeaa0d5 100644 (file)
--- a/src/TortoiseMerge/MainFrm.cpp
+++ b/src/TortoiseMerge/MainFrm.cpp
@@ -20,7 +20,7 @@
 #include "TortoiseMerge.h"\r
 #include "OpenDlg.h"\r
 #include "Patch.h"\r
-#include "ProgressDlg.h"\r
+#include "SysProgressDlg.h"\r
 #include "Settings.h"\r
 #include "MessageBox.h"\r
 #include "AppUtils.h"\r
@@ -388,7 +388,7 @@ BOOL CMainFrame::PatchFile(CString sFilePath, CString sVersion, BOOL bAutoPatch)
                //base file from version control and try\r
                //again...\r
                CString sTemp;\r
-               CProgressDlg progDlg;\r
+               CSysProgressDlg progDlg;\r
                sTemp.Format(IDS_GETVERSIONOFFILE, (LPCTSTR)sVersion);\r
                progDlg.SetLine(1, sTemp, true);\r
                progDlg.SetLine(2, sFilePath, true);\r
@@ -488,7 +488,7 @@ BOOL CMainFrame::DiffFiles(CString sURL1, CString sRev1, CString sURL2, CString
        ASSERT(tempfile1.Compare(tempfile2));\r
        \r
        CString sTemp;\r
-       CProgressDlg progDlg;\r
+       CSysProgressDlg progDlg;\r
        sTemp.Format(IDS_GETVERSIONOFFILE, (LPCTSTR)sRev1);\r
        progDlg.SetLine(1, sTemp, true);\r
        progDlg.SetLine(2, sURL1, true);\r
TortoiseGit日本語言語ファイル作成
About OSDN
Find Software
Develop Software
Help