OSDN Git Service

Merge remove x86 build
authorFrank Li <lznuaa@gmail.com>
Fri, 20 Feb 2009 05:19:38 +0000 (13:19 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 20 Feb 2009 05:19:38 +0000 (13:19 +0800)
16 files changed:
Languages/TortoiseLang.vcproj
ext/ResizableLib/ResizableLib.vcproj
ext/hunspell/hunspell.vcproj
src/Git/Git.vcproj
src/Git/GitStatusListCtrl.cpp
src/Git/GitStatusListCtrl.h
src/Resources/TortoiseProcENG.rc
src/TortoiseGit.sln
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseProc/AddDlg.cpp
src/TortoiseProc/ChangedDlg.cpp
src/TortoiseProc/CommitDlg.cpp
src/TortoiseProc/CommitDlg.h
src/TortoiseProc/RevertDlg.cpp
src/TortoiseProc/resource.h
src/Utils/Utils.vcproj

index 61e91d6..9169f2c 100644 (file)
@@ -40,9 +40,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
-                               ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
-                               CleanCommandLine="nmake /f Makefile clean "\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;_DEBUG"\r
+                               BuildCommandLine="adfad"\r
+                               ReBuildCommandLine=""\r
+                               CleanCommandLine=""\r
+                               Output="TortoiseLangs.exe"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG"\r
                                IncludeSearchPath=""\r
                                ForcedIncludes=""\r
                                AssemblySearchPath=""\r
@@ -81,8 +81,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
index 1f501c2..d60a260 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
+                       Name="Release|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
-                               BasicRuntimeChecks="0"\r
-                               RuntimeLibrary="3"\r
-                               DisableLanguageExtensions="false"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="1"\r
+                               FavorSizeOrSpeed="2"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                                ProgramDataBaseFileName="$(IntDir)/vc70.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
+                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
                                Culture="0"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="..\..\obj\ResizableLib\Release64"\r
-                       IntermediateDirectory="..\..\obj\ResizableLib\Release64"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="2"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+                               BasicRuntimeChecks="0"\r
+                               RuntimeLibrary="3"\r
+                               DisableLanguageExtensions="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                                ProgramDataBaseFileName="$(IntDir)/vc70.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
+                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
                                Culture="0"\r
                        />\r
                        <Tool\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="..\..\obj\ResizableLib\Debug64"\r
-                       IntermediateDirectory="..\..\obj\ResizableLib\Debug64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
index a16c63a..7565cdb 100644 (file)
@@ -93,9 +93,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
+                       Name="Release|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
+                               Optimization="2"\r
+                               InlineFunctionExpansion="1"\r
+                               PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile=".\Release/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1038"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Debug/hunspell.bsc"\r
+                               OutputFile=".\Release/hunspell.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release/hunspell.pch"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1038"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Release/hunspell.bsc"\r
+                               OutputFile=".\Debug/hunspell.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
index eed787b..c957810 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
-                       UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
index e8eb27a..df54196 100644 (file)
@@ -287,7 +287,7 @@ bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
        return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);\r
 }\r
 \r
-BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList\r
+BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList\r
                                    , bool bUpdate /* = FALSE */\r
                                    , bool bShowIgnores /* = false */\r
                                                                   , bool bShowUnRev\r
@@ -299,7 +299,7 @@ BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList
                mask|= CGitStatusListCtrl::FILELIST_IGNORE;\r
        if(bShowUnRev)\r
                mask|= CGitStatusListCtrl::FILELIST_UNVER;\r
-       this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);\r
+       this->UpdateFileList(mask,bUpdate,pathList);\r
 \r
 \r
 #if 0\r
index 8223e7a..13d5733 100644 (file)
@@ -514,7 +514,7 @@ public:
         * \param bUpdate TRUE if the remote status is requested too.\r
         * \return TRUE on success.\r
         */\r
-       BOOL GetStatus ( const CTGitPathList& pathList\r
+       BOOL GetStatus ( const CTGitPathList* pathList=NULL\r
                    , bool bUpdate = false\r
                    , bool bShowIgnores = false\r
                                   , bool bShowUnRev=false\r
index 3290da6..c68f02f 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
index bab6b69..7f6efec 100644 (file)
@@ -27,6 +27,25 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SciLexer", "..\ext\scintilla\vcbuild\SciLexer.vcproj", "{A5498556-CE09-4095-8335-08FC8370552D}"\r
 EndProject\r
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetup\WixSetup.wixproj", "{150172A5-8D02-4C00-ABB5-BD99D4B16B4C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214} = {50797F06-39C5-4802-8E2B-7B7A4EF03214}\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37} = {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01} = {62507C2F-9290-4342-910F-BFC44DF99B01}\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA} = {E873DD32-5A31-4DE1-8341-A56A2A5489EA}\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328} = {13BC1836-2726-45C4-9249-5BA2BBBF8328}\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475} = {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99} = {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}\r
+               {A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC} = {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D} = {72EFB681-1397-4193-BBF9-CA05AC52B75D}\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20} = {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}\r
+               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296} = {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} = {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF} = {4BE529FB-C2F2-49F7-A897-054B955564CF}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TGitCache", "TGitCache\TSVNCache.vcproj", "{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -53,498 +72,296 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResText", "ResText\ResText.vcproj", "{72EFB681-1397-4193-BBF9-CA05AC52B75D}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseProcLang", "TortoiseProc\TortoiseProcLang.vcproj", "{1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D} = {72EFB681-1397-4193-BBF9-CA05AC52B75D}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseLangs", "..\Languages\TortoiseLang.vcproj", "{EC88E7EC-3074-4841-BA45-B938D098EFF6}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               debug_static|Mixed Platforms = debug_static|Mixed Platforms\r
                debug_static|Win32 = debug_static|Win32\r
                debug_static|x64 = debug_static|x64\r
-               debug_static|x86 = debug_static|x86\r
-               Debug|Mixed Platforms = Debug|Mixed Platforms\r
                Debug|Win32 = Debug|Win32\r
                Debug|x64 = Debug|x64\r
-               Debug|x86 = Debug|x86\r
-               release_static|Mixed Platforms = release_static|Mixed Platforms\r
                release_static|Win32 = release_static|Win32\r
                release_static|x64 = release_static|x64\r
-               release_static|x86 = release_static|x86\r
-               Release|Mixed Platforms = Release|Mixed Platforms\r
                Release|Win32 = Release|Win32\r
                Release|x64 = Release|x64\r
-               Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.ActiveCfg = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.Build.0 = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x64.ActiveCfg = Debug|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.Build.0 = Release|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}.release_static|Win32.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.Build.0 = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x64.ActiveCfg = Release|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x86.ActiveCfg = Release|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.ActiveCfg = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.Build.0 = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x64.ActiveCfg = Debug|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.Build.0 = Release|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}.release_static|Win32.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.Build.0 = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x64.ActiveCfg = Release|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x86.ActiveCfg = Release|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.ActiveCfg = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.ActiveCfg = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.ActiveCfg = Debug|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.Build.0 = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Win32.ActiveCfg = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.ActiveCfg = Debug|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.Build.0 = Debug|x64\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.ActiveCfg = Debug|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.Build.0 = Debug|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.Build.0 = Debug|x86\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}.Debug|x86.ActiveCfg = Debug|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x86.Build.0 = Debug|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.ActiveCfg = Release|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.Build.0 = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Win32.ActiveCfg = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x64.ActiveCfg = Release|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x64.Build.0 = Release|x64\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.ActiveCfg = Release|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.Build.0 = Release|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.ActiveCfg = Release|x86\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|x86.ActiveCfg = Release|x86\r
-               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x86.Build.0 = Release|x86\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x64.Build.0 = Release|x64\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.Build.0 = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.ActiveCfg = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Mixed Platforms.Build.0 = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.ActiveCfg = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.Build.0 = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.ActiveCfg = Release|x64\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.Build.0 = Release|x64\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x86.ActiveCfg = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Mixed Platforms.ActiveCfg = Release|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}.Debug|x86.ActiveCfg = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Win32.ActiveCfg = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.Build.0 = Debug|Win32\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_static|x86.ActiveCfg = Debug|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Win32.ActiveCfg = Release|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Mixed Platforms.Build.0 = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.ActiveCfg = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Mixed Platforms.ActiveCfg = Release|Win32\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}.Debug|x86.ActiveCfg = Release|Win32\r
-               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Win32.ActiveCfg = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Win32.Build.0 = Release|Win32\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_static|x86.ActiveCfg = Release|Win32\r
-               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.Build.0 = Debug|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.Build.0 = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.ActiveCfg = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.Build.0 = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x86.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.Build.0 = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|x64.ActiveCfg = Debug|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Mixed Platforms.Build.0 = Debug|Win32\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}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Win32.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Win32.Build.0 = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|x64.ActiveCfg = Release|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|x86.ActiveCfg = Release|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Mixed Platforms.Build.0 = Release|Win32\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}.Release|x86.ActiveCfg = Release|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Mixed Platforms.ActiveCfg = debug_static|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Mixed Platforms.Build.0 = debug_static|Win32\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_static|x86.ActiveCfg = debug_static|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Mixed Platforms.Build.0 = Debug|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|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Mixed Platforms.ActiveCfg = release_static|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Mixed Platforms.Build.0 = release_static|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}.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_static|x86.ActiveCfg = release_static|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Mixed Platforms.Build.0 = Release|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}.Release|x86.ActiveCfg = Release|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.ActiveCfg = Release|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|Win32.Build.0 = Debug|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|x64.ActiveCfg = Debug|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|Mixed Platforms.Build.0 = Debug|Win32\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|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|Mixed Platforms.Build.0 = Release|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}.release_static|Win32.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|Win32.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|x64.ActiveCfg = Release|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|x86.ActiveCfg = Release|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.ActiveCfg = Release|x64\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.Build.0 = Release|x64\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x86.ActiveCfg = Release|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Win32.Build.0 = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|x64.ActiveCfg = Debug|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|Mixed Platforms.Build.0 = Release|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}.release_static|Win32.ActiveCfg = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|Win32.Build.0 = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|x64.ActiveCfg = Release|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.release_static|x86.ActiveCfg = Release|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32\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}.Release|x64.Build.0 = Release|x64\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x86.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 390bcc1..4a00c9e 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="false"\r
-                               ValidateParameters="true"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
-                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
-                               MinimalRebuild="false"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                        />\r
                                AdditionalLibraryDirectories=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\debug64\bin"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="false"\r
-                               TargetEnvironment="3"\r
+                               ValidateParameters="true"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
-                               PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
+                               MinimalRebuild="false"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
-                               LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="LIBCMTD"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="../../ext/wingit"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="..\..\bin\Release64\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCResourceCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCResourceCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
index 4bf10c1..7cc1135 100644 (file)
@@ -139,7 +139,7 @@ UINT CAddDlg::AddThread()
        DialogEnableWindow(IDOK, false);\r
        m_bCancelled = false;\r
        m_addListCtrl.Clear();\r
-       if (!m_addListCtrl.GetStatus(m_pathList,false,false,true,true))\r
+       if (!m_addListCtrl.GetStatus(&m_pathList,false,false,true,true))\r
        {\r
                m_addListCtrl.SetEmptyString(m_addListCtrl.GetLastErrorMessage());\r
        }\r
index 0ed86b3..37529d3 100644 (file)
@@ -138,7 +138,7 @@ UINT CChangedDlg::ChangedStatusThread()
        DialogEnableWindow(IDC_SHOWIGNORED, FALSE);\r
     DialogEnableWindow(IDC_SHOWUSERPROPS, FALSE);\r
        CString temp;\r
-       if (!m_FileListCtrl.GetStatus(m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
+       if (!m_FileListCtrl.GetStatus(&m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
        {\r
                if (!m_FileListCtrl.GetLastErrorMessage().IsEmpty())\r
                        m_FileListCtrl.SetEmptyString(m_FileListCtrl.GetLastErrorMessage());\r
index da34bf9..8b06ab6 100644 (file)
@@ -51,7 +51,7 @@ CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
        , m_bThreadRunning(FALSE)\r
        , m_bRunThread(FALSE)\r
        , m_pThread(NULL)\r
-       , m_bKeepLocks(FALSE)\r
+       , m_bWholeProject(FALSE)\r
        , m_bKeepChangeList(TRUE)\r
        , m_itemsCount(0)\r
        , m_bSelectFilesForCommit(TRUE)\r
@@ -74,7 +74,7 @@ void CCommitDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
        DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);\r
        DDX_Text(pDX, IDC_BUGID, m_sBugID);\r
-       DDX_Check(pDX, IDC_KEEPLOCK, m_bKeepLocks);\r
+       DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);\r
        DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);\r
        DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);\r
        DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);\r
@@ -113,7 +113,7 @@ BOOL CCommitDlg::OnInitDialog()
        m_bKeepChangeList = m_regKeepChangelists;\r
 \r
 //     GitConfig config;\r
-//     m_bKeepLocks = config.KeepLocks();\r
+//     m_bWholeProject = config.KeepLocks();\r
 \r
        UpdateData(FALSE);\r
        \r
@@ -199,7 +199,7 @@ BOOL CCommitDlg::OnInitDialog()
        \r
        AdjustControlSize(IDC_SHOWUNVERSIONED);\r
        AdjustControlSize(IDC_SELECTALL);\r
-       AdjustControlSize(IDC_KEEPLOCK);\r
+       AdjustControlSize(IDC_WHOLE_PROJECT);\r
 \r
        GetClientRect(m_DlgOrigRect);\r
        m_cLogMessage.GetClientRect(m_LogMsgOrigRect);\r
@@ -220,7 +220,7 @@ BOOL CCommitDlg::OnInitDialog()
        AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);\r
        AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);\r
        AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);\r
-       AddAnchor(IDC_KEEPLOCK, BOTTOM_LEFT);\r
+       AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);\r
        AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);\r
        AddAnchor(IDOK, BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL, BOTTOM_RIGHT);\r
@@ -601,8 +601,8 @@ void CCommitDlg::OnOK()
 #endif\r
        UpdateData();\r
        m_regAddBeforeCommit = m_bShowUnversioned;\r
-       if (!GetDlgItem(IDC_KEEPLOCK)->IsWindowEnabled())\r
-               m_bKeepLocks = FALSE;\r
+       if (!GetDlgItem(IDC_WHOLE_PROJECT)->IsWindowEnabled())\r
+               m_bWholeProject = FALSE;\r
        m_regKeepChangelists = m_bKeepChangeList;\r
        if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())\r
                m_bKeepChangeList = FALSE;\r
@@ -677,7 +677,7 @@ UINT CCommitDlg::StatusThread()
 #endif\r
     // Initialise the list control with the status of the files/folders below us\r
        m_ListCtrl.Clear();\r
-       BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
+       BOOL success = m_ListCtrl.GetStatus(&m_pathList);\r
 \r
        //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
        if(this->m_bShowUnversioned)\r
@@ -750,7 +750,7 @@ UINT CCommitDlg::StatusThread()
                if (m_ListCtrl.HasChangeLists())\r
                        DialogEnableWindow(IDC_KEEPLISTS, true);\r
                if (m_ListCtrl.HasLocks())\r
-                       DialogEnableWindow(IDC_KEEPLOCK, true);\r
+                       DialogEnableWindow(IDC_WHOLE_PROJECT, true);\r
                // we have the list, now signal the main thread about it\r
                SendMessage(WM_AUTOLISTREADY);  // only send the message if the thread wasn't told to quit!\r
        }\r
@@ -894,7 +894,7 @@ void CCommitDlg::OnBnClickedShowunversioned()
                        dwShow &= ~SVNSLC_SHOWUNVERSIONED;\r
                if(dwShow & SVNSLC_SHOWUNVERSIONED)\r
                {\r
-                       m_ListCtrl.GetStatus(this->m_pathList,false,false,true);\r
+                       m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);\r
                }\r
                m_ListCtrl.Show(dwShow);\r
        }\r
index be38eea..8a235b1 100644 (file)
@@ -103,7 +103,7 @@ public:
        BOOL                            m_bRecursive;\r
        CSciEdit                        m_cLogMessage;\r
        CString                         m_sLogMessage;\r
-       BOOL                            m_bKeepLocks;\r
+       BOOL                            m_bWholeProject;\r
        CString                         m_sBugID;\r
        CString                         m_sChangeList;\r
        BOOL                            m_bKeepChangeList;\r
index 7b6a017..b37d254 100644 (file)
@@ -108,7 +108,7 @@ UINT CRevertDlg::RevertThread()
        DialogEnableWindow(IDOK, false);\r
        m_bCancelled = false;\r
 \r
-       if (!m_RevertList.GetStatus(m_pathList))\r
+       if (!m_RevertList.GetStatus(&m_pathList))\r
        {\r
                m_RevertList.SetEmptyString(m_RevertList.GetLastErrorMessage());\r
        }\r
index 2a3327e..9fe6ebd 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ
index e239d1a..ae0a085 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
-                       UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r