From: unknown Date: Thu, 8 Jan 2009 10:11:23 +0000 (+0800) Subject: Try to enable 64bit compile X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=bbcbbf793772c0a9f549b2400617bcf6e3302006 Try to enable 64bit compile --- diff --git a/ext/hunspell/hunspell.vcproj b/ext/hunspell/hunspell.vcproj index c08b20b..e9f3fe0 100644 --- a/ext/hunspell/hunspell.vcproj +++ b/ext/hunspell/hunspell.vcproj @@ -11,6 +11,9 @@ + @@ -161,6 +164,154 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -188,6 +339,22 @@ PreprocessorDefinitions="" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -196,6 +199,187 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -205,7 +389,1847 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj index e273009..0a1be56 100644 --- a/src/Git/Git.vcproj +++ b/src/Git/Git.vcproj @@ -12,6 +12,9 @@ + @@ -144,6 +147,136 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -192,6 +325,22 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln index b183b06..4c57a4f 100644 --- a/src/TortoiseGit.sln +++ b/src/TortoiseGit.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Git", "Git\Git.vcproj", "{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseProc", "TortoiseProc\TortoiseProc.vcproj", "{50797F06-39C5-4802-8E2B-7B7A4EF03214}" @@ -21,12 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils", "Utils\Utils.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "..\ext\hunspell\hunspell.vcproj", "{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D2432E38-DE08-45B0-95B0-8EA06AFCBF26}" - ProjectSection(SolutionItems) = preProject - LocalTestRun.testrunconfig = LocalTestRun.testrunconfig - TortoiseGit.vsmdi = TortoiseGit.vsmdi - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResizableLib", "..\ext\ResizableLib\ResizableLib.vcproj", "{4BE529FB-C2F2-49F7-A897-054B955564CF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SciLexer", "..\ext\scintilla\vcbuild\SciLexer.vcproj", "{A5498556-CE09-4095-8335-08FC8370552D}" @@ -50,15 +44,19 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_static|Mixed Platforms = debug_static|Mixed Platforms debug_static|Win32 = debug_static|Win32 + debug_static|x64 = debug_static|x64 debug_static|x86 = debug_static|x86 Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 release_static|Mixed Platforms = release_static|Mixed Platforms release_static|Win32 = release_static|Win32 + release_static|x64 = release_static|x64 release_static|x86 = release_static|x86 Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -66,281 +64,392 @@ Global {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.Build.0 = Debug|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x64.ActiveCfg = Debug|x64 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x64.Build.0 = Debug|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x86.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.Build.0 = Debug|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.ActiveCfg = Debug|x64 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.Build.0 = Debug|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x86.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.Build.0 = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.Build.0 = Release|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.ActiveCfg = Release|x64 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.Build.0 = Release|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x86.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.Build.0 = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|x64 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.Build.0 = Release|x64 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x86.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.Build.0 = Debug|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x64.ActiveCfg = Debug|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x64.Build.0 = Debug|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x86.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.Build.0 = Debug|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.ActiveCfg = Debug|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.Build.0 = Debug|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x86.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.Build.0 = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.Build.0 = Release|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x64.ActiveCfg = Release|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x64.Build.0 = Release|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x86.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.Build.0 = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|x64 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.Build.0 = Release|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x86.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.Build.0 = Debug|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.ActiveCfg = Debug|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.Build.0 = Debug|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x86.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.Build.0 = Debug|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.ActiveCfg = Debug|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.Build.0 = Debug|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x86.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.Build.0 = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.Build.0 = Release|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.ActiveCfg = Release|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.Build.0 = Release|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x86.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.Build.0 = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.Build.0 = Release|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.ActiveCfg = Release|x64 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.Build.0 = Release|x64 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x86.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.Build.0 = Debug|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.ActiveCfg = Debug|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.Build.0 = Debug|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x86.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.Build.0 = Debug|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.ActiveCfg = Debug|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.Build.0 = Debug|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x86.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.Build.0 = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.Build.0 = Release|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.ActiveCfg = Release|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.Build.0 = Release|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x86.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.Build.0 = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.Build.0 = Release|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.ActiveCfg = Release|x64 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.Build.0 = Release|x64 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x86.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.Build.0 = Debug|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x64.ActiveCfg = Debug|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x64.Build.0 = Debug|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x86.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.Build.0 = Debug|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.ActiveCfg = Debug|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.Build.0 = Debug|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x86.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.Build.0 = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.Build.0 = Release|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x64.ActiveCfg = Release|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x64.Build.0 = Release|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x86.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.Build.0 = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|x64 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.Build.0 = Release|x64 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x86.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.Build.0 = Debug|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.ActiveCfg = Debug|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.Build.0 = Debug|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x86.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.Build.0 = Debug|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.ActiveCfg = Debug|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.Build.0 = Debug|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x86.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.Build.0 = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.Build.0 = Release|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.ActiveCfg = Release|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.Build.0 = Release|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x86.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.Build.0 = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.Build.0 = Release|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.ActiveCfg = Release|x64 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.Build.0 = Release|x64 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x86.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.Build.0 = Debug|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.ActiveCfg = Debug|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.Build.0 = Debug|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x86.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.Build.0 = Debug|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.ActiveCfg = Debug|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.Build.0 = Debug|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x86.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.Build.0 = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.Build.0 = Release|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.ActiveCfg = Release|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.Build.0 = Release|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x86.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.Build.0 = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.Build.0 = Release|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.ActiveCfg = Release|x64 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.Build.0 = Release|x64 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x86.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.Build.0 = Debug|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.ActiveCfg = Debug|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.Build.0 = Debug|x64 {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x86.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.Build.0 = Debug|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.ActiveCfg = Debug|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.Build.0 = Debug|x64 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x86.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.Build.0 = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.Build.0 = Release|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.ActiveCfg = Release|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.Build.0 = Release|x64 {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x86.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.Build.0 = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.Build.0 = Release|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.ActiveCfg = Release|x64 + {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.Build.0 = Release|x64 {A5498556-CE09-4095-8335-08FC8370552D}.Release|x86.ActiveCfg = Release|Win32 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.Build.0 = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Win32.ActiveCfg = Debug|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.ActiveCfg = Debug|x64 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.Build.0 = Debug|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.Build.0 = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.Build.0 = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Win32.ActiveCfg = Debug|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x64.ActiveCfg = Debug|x64 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x64.Build.0 = Debug|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x86.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x86.Build.0 = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.Build.0 = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Win32.ActiveCfg = Release|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x64.ActiveCfg = Release|x64 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x64.Build.0 = Release|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.Build.0 = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.Build.0 = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Win32.ActiveCfg = Release|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x64.ActiveCfg = Release|x64 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x86.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x86.Build.0 = Release|x86 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.ActiveCfg = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.Build.0 = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x64.ActiveCfg = Debug|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x64.Build.0 = Debug|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x86.ActiveCfg = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.ActiveCfg = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.Build.0 = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.ActiveCfg = Debug|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.Build.0 = Debug|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x86.ActiveCfg = Debug|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.Build.0 = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.ActiveCfg = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.Build.0 = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.ActiveCfg = Release|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.Build.0 = Release|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x86.ActiveCfg = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.Build.0 = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.ActiveCfg = Release|x64 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.Build.0 = Release|x64 {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x86.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Mixed Platforms.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Mixed Platforms.Build.0 = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.Build.0 = Release|Win32 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.ActiveCfg = Release|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.Build.0 = Release|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x86.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Mixed Platforms.Build.0 = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.Build.0 = Release|Win32 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.ActiveCfg = Release|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.Build.0 = Release|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x86.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Mixed Platforms.Build.0 = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Win32.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Win32.Build.0 = Release|Win32 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.ActiveCfg = Release|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.Build.0 = Release|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x86.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Mixed Platforms.Build.0 = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.ActiveCfg = Release|Win32 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.Build.0 = Release|Win32 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.ActiveCfg = Release|x64 + {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.Build.0 = Release|x64 {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x86.ActiveCfg = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.debug_static|Win32.ActiveCfg = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.debug_static|Win32.Build.0 = Debug|Win32 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.debug_static|x64.ActiveCfg = Debug|x64 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.debug_static|x64.Build.0 = Debug|x64 {4424F9D2-12EE-49A7-941E-45767900BEA3}.debug_static|x86.ActiveCfg = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Debug|Win32.ActiveCfg = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Debug|Win32.Build.0 = Debug|Win32 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.Debug|x64.ActiveCfg = Debug|x64 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.Debug|x64.Build.0 = Debug|x64 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Debug|x86.ActiveCfg = Debug|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.release_static|Mixed Platforms.Build.0 = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.release_static|Win32.ActiveCfg = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.release_static|Win32.Build.0 = Release|Win32 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.release_static|x64.ActiveCfg = Release|x64 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.release_static|x64.Build.0 = Release|x64 {4424F9D2-12EE-49A7-941E-45767900BEA3}.release_static|x86.ActiveCfg = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Release|Mixed Platforms.Build.0 = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Release|Win32.ActiveCfg = Release|Win32 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Release|Win32.Build.0 = Release|Win32 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.Release|x64.ActiveCfg = Release|x64 + {4424F9D2-12EE-49A7-941E-45767900BEA3}.Release|x64.Build.0 = Release|x64 {4424F9D2-12EE-49A7-941E-45767900BEA3}.Release|x86.ActiveCfg = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.ActiveCfg = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.Build.0 = Debug|Win32 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.ActiveCfg = Debug|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.Build.0 = Debug|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x86.ActiveCfg = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.ActiveCfg = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.Build.0 = Debug|Win32 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.ActiveCfg = Debug|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.Build.0 = Debug|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x86.ActiveCfg = Debug|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Mixed Platforms.Build.0 = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Win32.ActiveCfg = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Win32.Build.0 = Release|Win32 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.ActiveCfg = Release|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.Build.0 = Release|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x86.ActiveCfg = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Mixed Platforms.Build.0 = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.ActiveCfg = Release|Win32 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.Build.0 = Release|Win32 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.ActiveCfg = Release|x64 + {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.Build.0 = Release|x64 {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x86.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Mixed Platforms.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Mixed Platforms.Build.0 = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.Build.0 = Release|Win32 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|x64.ActiveCfg = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|x64.Build.0 = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|x86.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Mixed Platforms.Build.0 = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Win32.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|Win32.Build.0 = Release|Win32 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|x64.ActiveCfg = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|x64.Build.0 = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Debug|x86.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Mixed Platforms.Build.0 = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Win32.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|Win32.Build.0 = Release|Win32 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|x64.ActiveCfg = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|x64.Build.0 = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.release_static|x86.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Mixed Platforms.Build.0 = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Win32.ActiveCfg = Release|Win32 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|Win32.Build.0 = Release|Win32 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.ActiveCfg = Release|x64 + {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.Build.0 = Release|x64 {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x86.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user index 55dd3ea..4ad7b75 100644 --- a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user +++ b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user @@ -33,5 +33,33 @@ MPIAcceptFilter="" /> + + + diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi index 33ccef6..95a5707 100644 --- a/src/TortoiseGitSetup/StructureFragment.wxi +++ b/src/TortoiseGitSetup/StructureFragment.wxi @@ -28,12 +28,12 @@ - - - - - - + + + + + + @@ -41,7 +41,9 @@ --> + diff --git a/src/TortoiseGitSetup/WiXSetup.wixproj b/src/TortoiseGitSetup/WiXSetup.wixproj index 8137edf..da0567d 100644 --- a/src/TortoiseGitSetup/WiXSetup.wixproj +++ b/src/TortoiseGitSetup/WiXSetup.wixproj @@ -19,12 +19,28 @@ - ..\..\bin\setup\ + ..\..\bin\setup\x86\ obj\$(Configuration)\ IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules; + + Debug;IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules; + + + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules; + + + ..\..\bin\setup\x64\ + obj\$(Platform)\$(Configuration)\ +