Removed external_64 compilation mode

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>

Microsoft.Z3/Microsoft.Z3.csproj

@@ -207,75 +207,6 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'external_64|AnyCPU'">
-    <OutputPath>..\x64\external_64\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>..\x64\external_64\Microsoft.Z3.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Microsoft.Z3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'external_64|x64'">
-    <OutputPath>..\x64\external_64\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>..\x64\external_64\Microsoft.Z3.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Microsoft.Z3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <CodeContractsEnableRuntimeChecking>True</CodeContractsEnableRuntimeChecking>
-    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
-    <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
-    <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
-    <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
-    <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
-    <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
-    <CodeContractsBoundsObligations>False</CodeContractsBoundsObligations>
-    <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
-    <CodeContractsEnumObligations>False</CodeContractsEnumObligations>
-    <CodeContractsPointerObligations>False</CodeContractsPointerObligations>
-    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
-    <CodeContractsInferRequires>False</CodeContractsInferRequires>
-    <CodeContractsInferEnsures>False</CodeContractsInferEnsures>
-    <CodeContractsInferObjectInvariants>False</CodeContractsInferObjectInvariants>
-    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
-    <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
-    <CodeContractsSuggestEnsures>False</CodeContractsSuggestEnsures>
-    <CodeContractsSuggestObjectInvariants>False</CodeContractsSuggestObjectInvariants>
-    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
-    <CodeContractsShowSquigglies>False</CodeContractsShowSquigglies>
-    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
-    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
-    <CodeContractsCustomRewriterAssembly />
-    <CodeContractsCustomRewriterClass />
-    <CodeContractsLibPaths />
-    <CodeContractsExtraRewriteOptions />
-    <CodeContractsExtraAnalysisOptions />
-    <CodeContractsBaseLineFile />
-    <CodeContractsCacheAnalysisResults>False</CodeContractsCacheAnalysisResults>
-    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
-    <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
-    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
-  </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>

README

@@ -9,15 +9,15 @@ Z3 can be built using Visual Studio Command Prompt, Visual Studio and make/gcc.
 
 - For building all components, execute
     msbuild z3-prover.sln /p:configuration=external 
-  All components will be located at /external
+  All components will be located at \external
 
 - For building all components (64-bit), execute
-    msbuild z3-prover.sln /p:configuration=external_64 /p:platform=x64
+    msbuild z3-prover.sln /p:configuration=external /p:platform=x64
-  All components will be located at /external_64
+  All components will be located at \x64\external
 
 - For building all components (in debug mode), execute
     msbuild z3-prover.sln 
-  All components will be located at /debug
+  All components will be located at \Debug
 
 2) Building Z3 using g++/make
 Your machine must also have the following commands to be able to build Z3:

dll/dll.vcxproj

@@ -25,30 +25,6 @@
       <Configuration>external_64</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="external_dbg|Win32">
-      <Configuration>external_dbg</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="external_dbg|x64">
-      <Configuration>external_dbg</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="external_parallel_x64|Win32">
-      <Configuration>external_parallel_x64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="external_parallel_x64|x64">
-      <Configuration>external_parallel_x64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="external_parallel|Win32">
-      <Configuration>external_parallel</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="external_parallel|x64">
-      <Configuration>external_parallel</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="external|Win32">
       <Configuration>external</Configuration>
       <Platform>Win32</Platform>
@@ -57,38 +33,6 @@
       <Configuration>external</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="mpi_debug|Win32">
-      <Configuration>mpi_debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="mpi_debug|x64">
-      <Configuration>mpi_debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="mpi_release|Win32">
-      <Configuration>mpi_release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="mpi_release|x64">
-      <Configuration>mpi_release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="parallel_debug|Win32">
-      <Configuration>parallel_debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="parallel_debug|x64">
-      <Configuration>parallel_debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="parallel_release|Win32">
-      <Configuration>parallel_release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="parallel_release|x64">
-      <Configuration>parallel_release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="release_mt|Win32">
       <Configuration>release_mt</Configuration>
       <Platform>Win32</Platform>
@@ -97,14 +41,6 @@
       <Configuration>release_mt</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static|Win32">
-      <Configuration>release_static</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static|x64">
-      <Configuration>release_static</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -113,14 +49,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="smtcomp|Win32">
-      <Configuration>smtcomp</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="smtcomp|x64">
-      <Configuration>smtcomp</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="trace|Win32">
       <Configuration>trace</Configuration>
       <Platform>Win32</Platform>
@@ -141,54 +69,11 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_64|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_mt|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -218,51 +103,11 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_64|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='mpi_debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -293,36 +138,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='trace|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_64|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_mt|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -341,36 +159,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='trace|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_64|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='mpi_debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -419,62 +210,12 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='external_64|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='external_64|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_64|Win32'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='external_64|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='external_64|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='trace|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='trace|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='trace|Win32'">false</LinkIncremental>
@@ -493,24 +234,6 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external_64|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external_64|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external_64|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='external|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='commercial|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='external|Win32'" />
@@ -523,54 +246,18 @@
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='commercial|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='external|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='commercial|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='mpi_debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='mpi_debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='mpi_debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='release_mt|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='release_mt|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='release_mt|Win32'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='release_static|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='release_static|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='release_static|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'" />
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='trace|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='trace|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='trace|Win32'" />
@@ -581,33 +268,15 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">z3_dbg</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='external_64|x64'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='external_64|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='external|Win32'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='commercial|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'">z3_dbg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'">z3_dbg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_mt|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='trace|Win32'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'">z3_dbg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='external|x64'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='commercial|x64'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='mpi_debug|x64'">z3_dbg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='mpi_release|x64'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'">z3_dbg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_mt|x64'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static|x64'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">z3</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'">z3</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='trace|x64'">z3</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -755,7 +424,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AMD64_;WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -844,287 +513,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external_dbg|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;Z3DEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3_dbg.dll</OutputFile>
-      <ModuleDefinitionFile>z3_dbg.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external_dbg|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;Z3DEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3_dbg.dll</OutputFile>
-      <ModuleDefinitionFile>z3_dbg.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='parallel_debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>true</OpenMPSupport>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3_dbg.dll</OutputFile>
-      <ModuleDefinitionFile>z3_dbg.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='parallel_debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3_dbg.dll</OutputFile>
-      <ModuleDefinitionFile>z3_dbg.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='parallel_release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;ASYNC_COMMANDS;_Z3_BUILD_PARALLEL_SMT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>true</OpenMPSupport>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='parallel_release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='mpi_release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='mpi_debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3_dbg.dll</OutputFile>
-      <ModuleDefinitionFile>z3_dbg.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='smtcomp|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='smtcomp|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external_64|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1171,104 +559,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel_x64|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>true</OpenMPSupport>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>true</OpenMPSupport>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external_parallel|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>true</OpenMPSupport>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)z3.dll</OutputFile>
-      <ModuleDefinitionFile>z3.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)z3_dll.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='trace|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

maxsat/maxsat.vcxproj

@@ -1,26 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="commercial_64|Win32">
-      <Configuration>commercial_64</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="commercial|Win32">
       <Configuration>commercial</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="commercial|x64">
+      <Configuration>commercial</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="external|Win32">
       <Configuration>external</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="external|x64">
+      <Configuration>external</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7C154132-AAAB-4F60-B652-F8C51A63D244}</ProjectGuid>
@@ -33,19 +45,30 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='commercial_64|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -57,40 +80,64 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='commercial|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='commercial_64|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='external|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='commercial|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='commercial|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='commercial_64|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='external|x64'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='commercial|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='commercial|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -106,6 +153,21 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\lib</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -124,6 +186,24 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\lib</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -142,7 +222,25 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='commercial_64|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='external|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_AMD64_;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\lib</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='commercial|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
@@ -160,7 +258,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='commercial|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='commercial|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>

shell/main.cpp

@@ -56,7 +56,11 @@ void error(const char * msg) {
 }
 
 void display_usage() {
-    std::cout << "Z3 [version " << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << "]. (C) Copyright 2006 Microsoft Corp.\n";
+#ifdef _AMD64_
+    std::cout << "Z3 [version " << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << " - 64 bit]. (C) Copyright 2006 Microsoft Corp.\n";
+#else
+    std::cout << "Z3 [version " << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << " - 32 bit]. (C) Copyright 2006 Microsoft Corp.\n";
+#endif
     std::cout << "Usage: z3 [options] [" << OPT << "file:]file\n";
     std::cout << "\nInput format:\n";
     std::cout << "  " << OPT << "smt        use parser for SMT input format.\n";

z3-prover.sln

@@ -38,26 +38,11 @@ Global
 		commercial|Win32 = commercial|Win32
 		commercial|x64 = commercial|x64
 		commercial|x86 = commercial|x86
-		debug_opt|Any CPU = debug_opt|Any CPU
-		debug_opt|Mixed Platforms = debug_opt|Mixed Platforms
-		debug_opt|Win32 = debug_opt|Win32
-		debug_opt|x64 = debug_opt|x64
-		debug_opt|x86 = debug_opt|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		external_64|Any CPU = external_64|Any CPU
-		external_64|Mixed Platforms = external_64|Mixed Platforms
-		external_64|Win32 = external_64|Win32
-		external_64|x64 = external_64|x64
-		external_64|x86 = external_64|x86
-		external_dbg|Any CPU = external_dbg|Any CPU
-		external_dbg|Mixed Platforms = external_dbg|Mixed Platforms
-		external_dbg|Win32 = external_dbg|Win32
-		external_dbg|x64 = external_dbg|x64
-		external_dbg|x86 = external_dbg|x86
 		external|Any CPU = external|Any CPU
 		external|Mixed Platforms = external|Mixed Platforms
 		external|Win32 = external|Win32
@@ -98,13 +83,6 @@ Global
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.commercial|x64.ActiveCfg = commercial|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.commercial|x64.Build.0 = commercial|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.commercial|x86.ActiveCfg = commercial|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.debug_opt|Any CPU.ActiveCfg = debug_opt|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.debug_opt|Mixed Platforms.ActiveCfg = debug_opt|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.debug_opt|Mixed Platforms.Build.0 = debug_opt|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.debug_opt|Win32.ActiveCfg = debug_opt|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.debug_opt|Win32.Build.0 = debug_opt|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.debug_opt|x64.ActiveCfg = debug_opt|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.debug_opt|x86.ActiveCfg = debug_opt|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Debug|Any CPU.Build.0 = Debug|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
@@ -114,36 +92,22 @@ Global
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Debug|x64.ActiveCfg = Debug|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Debug|x64.Build.0 = Debug|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Debug|x86.ActiveCfg = Debug|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_64|Any CPU.ActiveCfg = external_64|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_64|Mixed Platforms.ActiveCfg = external_64|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_64|Mixed Platforms.Build.0 = external_64|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_64|Win32.ActiveCfg = external_64|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_64|x64.ActiveCfg = external_64|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_64|x64.Build.0 = external_64|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_64|x86.ActiveCfg = external_64|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|Any CPU.ActiveCfg = external_dbg|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|Any CPU.Build.0 = external_dbg|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|Mixed Platforms.ActiveCfg = external_dbg|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|Mixed Platforms.Build.0 = external_dbg|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|Win32.ActiveCfg = external_dbg|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|Win32.Build.0 = external_dbg|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|x64.ActiveCfg = external_dbg|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external_dbg|x86.ActiveCfg = external_dbg|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|Any CPU.ActiveCfg = external|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|Any CPU.Build.0 = external|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|Mixed Platforms.ActiveCfg = external|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|Mixed Platforms.Build.0 = external|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|Win32.ActiveCfg = external|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|Win32.Build.0 = external|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|x64.ActiveCfg = external|Win32
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|x64.ActiveCfg = external|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|x86.ActiveCfg = external|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|x64.Build.0 = external|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.external|x86.ActiveCfg = external|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|Any CPU.ActiveCfg = Release|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|Mixed Platforms.ActiveCfg = Release|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|Mixed Platforms.Build.0 = Release|Win32
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|Win32.ActiveCfg = release_static|Win32
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|Win32.ActiveCfg = release_mt|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|x64.ActiveCfg = Release|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|x64.Build.0 = Release|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|x86.ActiveCfg = release_static|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release_delaysign|x86.ActiveCfg = release_mt|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.release_mt|Any CPU.ActiveCfg = release_mt|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.release_mt|Any CPU.Build.0 = release_mt|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.release_mt|Mixed Platforms.ActiveCfg = release_mt|Win32
@@ -161,13 +125,13 @@ Global
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release|x64.ActiveCfg = Release|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release|x64.Build.0 = Release|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Release|x86.ActiveCfg = Release|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Any CPU.ActiveCfg = smtcomp|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Any CPU.ActiveCfg = Trace|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Mixed Platforms.ActiveCfg = smtcomp|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Mixed Platforms.ActiveCfg = Trace|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Mixed Platforms.Build.0 = smtcomp|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Mixed Platforms.Build.0 = Trace|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Win32.ActiveCfg = smtcomp|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|Win32.ActiveCfg = Trace|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|x64.ActiveCfg = smtcomp|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|x64.ActiveCfg = Trace|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|x64.Build.0 = smtcomp|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|x64.Build.0 = Trace|x64
-		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|x86.ActiveCfg = smtcomp|x64
+		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Setup|x86.ActiveCfg = Trace|x64
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Trace|Any CPU.ActiveCfg = Trace|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Trace|Mixed Platforms.ActiveCfg = Trace|Win32
 		{4A7E5A93-19D8-4382-8950-FB2EDEC7A76E}.Trace|Mixed Platforms.Build.0 = Trace|Win32
@@ -183,13 +147,6 @@ Global
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.commercial|x64.ActiveCfg = commercial|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.commercial|x64.Build.0 = commercial|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.commercial|x86.ActiveCfg = commercial|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.debug_opt|Any CPU.ActiveCfg = debug_opt|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.debug_opt|Mixed Platforms.ActiveCfg = debug_opt|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.debug_opt|Mixed Platforms.Build.0 = debug_opt|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.debug_opt|Win32.ActiveCfg = debug_opt|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.debug_opt|Win32.Build.0 = debug_opt|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.debug_opt|x64.ActiveCfg = debug_opt|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.debug_opt|x86.ActiveCfg = debug_opt|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Debug|Any CPU.Build.0 = Debug|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
@@ -199,35 +156,22 @@ Global
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Debug|x64.ActiveCfg = Debug|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Debug|x64.Build.0 = Debug|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Debug|x86.ActiveCfg = Debug|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_64|Any CPU.ActiveCfg = external_64|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_64|Mixed Platforms.ActiveCfg = external_64|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_64|Mixed Platforms.Build.0 = external_64|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_64|Win32.ActiveCfg = external_64|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_64|x64.ActiveCfg = external_64|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_64|x64.Build.0 = external_64|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_64|x86.ActiveCfg = external_64|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_dbg|Any CPU.ActiveCfg = external_dbg|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_dbg|Mixed Platforms.ActiveCfg = external_dbg|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_dbg|Mixed Platforms.Build.0 = external_dbg|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_dbg|Win32.ActiveCfg = external_dbg|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_dbg|Win32.Build.0 = external_dbg|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_dbg|x64.ActiveCfg = external_dbg|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external_dbg|x86.ActiveCfg = external_dbg|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|Any CPU.ActiveCfg = external|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|Any CPU.Build.0 = external|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|Mixed Platforms.ActiveCfg = external|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|Mixed Platforms.Build.0 = external|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|Win32.ActiveCfg = external|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|Win32.Build.0 = external|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|x64.ActiveCfg = external|Win32
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|x64.ActiveCfg = external|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|x86.ActiveCfg = external|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|x64.Build.0 = external|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|Any CPU.ActiveCfg = release_static|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.external|x86.ActiveCfg = external|Win32
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|Any CPU.ActiveCfg = release_mt|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|Mixed Platforms.ActiveCfg = Release|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|Mixed Platforms.Build.0 = Release|Win32
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|Win32.ActiveCfg = release_static|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|Win32.ActiveCfg = release_mt|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|x64.ActiveCfg = Release|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|x64.Build.0 = Release|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|x86.ActiveCfg = release_static|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release_delaysign|x86.ActiveCfg = release_mt|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.release_mt|Any CPU.ActiveCfg = release_mt|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.release_mt|Any CPU.Build.0 = release_mt|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.release_mt|Mixed Platforms.ActiveCfg = release_mt|Win32
@@ -245,13 +189,13 @@ Global
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release|x64.ActiveCfg = Release|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release|x64.Build.0 = Release|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Release|x86.ActiveCfg = Release|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Any CPU.ActiveCfg = smtcomp|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Any CPU.ActiveCfg = Trace|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Mixed Platforms.ActiveCfg = smtcomp|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Mixed Platforms.ActiveCfg = Trace|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Mixed Platforms.Build.0 = smtcomp|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Mixed Platforms.Build.0 = Trace|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Win32.ActiveCfg = smtcomp|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|Win32.ActiveCfg = Trace|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|x64.ActiveCfg = smtcomp|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|x64.ActiveCfg = Trace|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|x64.Build.0 = smtcomp|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|x64.Build.0 = Trace|x64
-		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|x86.ActiveCfg = smtcomp|x64
+		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Setup|x86.ActiveCfg = Trace|x64
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Trace|Any CPU.ActiveCfg = Trace|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Trace|Mixed Platforms.ActiveCfg = Trace|Win32
 		{BF547582-F16D-4BE5-B9AB-8B6A9364B447}.Trace|Mixed Platforms.Build.0 = Trace|Win32
@@ -264,12 +208,6 @@ Global
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.commercial|Win32.ActiveCfg = commercial|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.commercial|x64.ActiveCfg = commercial|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.commercial|x86.ActiveCfg = commercial|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.debug_opt|Any CPU.ActiveCfg = Debug|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.debug_opt|Mixed Platforms.ActiveCfg = debug_opt|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.debug_opt|Mixed Platforms.Build.0 = debug_opt|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.debug_opt|Win32.ActiveCfg = Debug|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.debug_opt|x64.ActiveCfg = Debug|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.debug_opt|x86.ActiveCfg = debug_opt|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Debug|Any CPU.Build.0 = Debug|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
@@ -279,27 +217,17 @@ Global
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Debug|x64.ActiveCfg = Debug|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Debug|x64.Build.0 = Debug|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Debug|x86.ActiveCfg = Debug|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_64|Any CPU.ActiveCfg = external_64|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_64|Mixed Platforms.ActiveCfg = external_64|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_64|Mixed Platforms.Build.0 = external_64|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_64|Win32.ActiveCfg = external_64|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_64|x64.ActiveCfg = external_64|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_64|x86.ActiveCfg = external_64|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_dbg|Any CPU.ActiveCfg = external_dbg|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_dbg|Mixed Platforms.ActiveCfg = external_dbg|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_dbg|Win32.ActiveCfg = external_dbg|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_dbg|x64.ActiveCfg = external_dbg|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external_dbg|x86.ActiveCfg = external_dbg|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external|Any CPU.ActiveCfg = external|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external|Mixed Platforms.ActiveCfg = external|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external|Win32.ActiveCfg = external|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external|x64.ActiveCfg = external|Win32
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external|x64.ActiveCfg = external|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external|x86.ActiveCfg = external|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.external|x86.ActiveCfg = external|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|Any CPU.ActiveCfg = Release|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|Mixed Platforms.ActiveCfg = Release|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|Win32.ActiveCfg = Release|Win32
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|x64.ActiveCfg = release_delaysign|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|x64.ActiveCfg = release_mt|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|x86.ActiveCfg = release_delaysign|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|x64.Build.0 = release_mt|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release_delaysign|x86.ActiveCfg = release_mt|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.release_mt|Any CPU.ActiveCfg = release_mt|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.release_mt|Mixed Platforms.ActiveCfg = release_mt|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.release_mt|Win32.ActiveCfg = release_mt|Win32
@@ -313,13 +241,13 @@ Global
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release|x64.ActiveCfg = Release|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release|x64.Build.0 = Release|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Release|x86.ActiveCfg = Release|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Any CPU.ActiveCfg = smtcomp|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Any CPU.ActiveCfg = Trace|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Mixed Platforms.ActiveCfg = smtcomp|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Mixed Platforms.ActiveCfg = Trace|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Mixed Platforms.Build.0 = smtcomp|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Mixed Platforms.Build.0 = Trace|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Win32.ActiveCfg = smtcomp|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|Win32.ActiveCfg = Trace|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|x64.ActiveCfg = smtcomp|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|x64.ActiveCfg = Trace|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|x64.Build.0 = smtcomp|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|x64.Build.0 = Trace|x64
-		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|x86.ActiveCfg = smtcomp|x64
+		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Setup|x86.ActiveCfg = Trace|x64
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Trace|Any CPU.ActiveCfg = Trace|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Trace|Mixed Platforms.ActiveCfg = Trace|Win32
 		{21A10ECD-32E2-4F27-A03D-81D855A048CC}.Trace|Mixed Platforms.Build.0 = Trace|Win32
@@ -332,12 +260,6 @@ Global
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.commercial|Win32.ActiveCfg = commercial|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.commercial|x64.ActiveCfg = commercial|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.commercial|x86.ActiveCfg = commercial|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.debug_opt|Any CPU.ActiveCfg = Debug|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.debug_opt|Mixed Platforms.ActiveCfg = debug_opt|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.debug_opt|Win32.ActiveCfg = Debug|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.debug_opt|Win32.Build.0 = Debug|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.debug_opt|x64.ActiveCfg = Debug|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.debug_opt|x86.ActiveCfg = debug_opt|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -346,28 +268,19 @@ Global
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Debug|x64.ActiveCfg = Debug|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Debug|x64.Build.0 = Debug|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Debug|x86.ActiveCfg = Debug|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_64|Any CPU.ActiveCfg = external_64|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_64|Mixed Platforms.ActiveCfg = external_64|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_64|Mixed Platforms.Build.0 = external_64|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_64|Win32.ActiveCfg = external_64|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_64|x64.ActiveCfg = external_64|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_64|x86.ActiveCfg = external_64|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_dbg|Any CPU.ActiveCfg = external_dbg|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_dbg|Mixed Platforms.ActiveCfg = external_dbg|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_dbg|Win32.ActiveCfg = external_dbg|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_dbg|Win32.Build.0 = external_dbg|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_dbg|x64.ActiveCfg = external_dbg|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external_dbg|x86.ActiveCfg = external_dbg|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|Any CPU.ActiveCfg = Release|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|Mixed Platforms.ActiveCfg = Release|Win32
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|Mixed Platforms.ActiveCfg = external|Win32
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|Mixed Platforms.Build.0 = external|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|Win32.ActiveCfg = Release|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|x64.ActiveCfg = Release|Win32
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|x64.ActiveCfg = external|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|x86.ActiveCfg = external_parallel|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|x64.Build.0 = external|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|Any CPU.ActiveCfg = release_static|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.external|x86.ActiveCfg = Release|Win32
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|Any CPU.ActiveCfg = release_mt|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|Mixed Platforms.ActiveCfg = Release|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|Win32.ActiveCfg = release_static|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|Win32.ActiveCfg = release_mt|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|x64.ActiveCfg = release_static|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|x64.ActiveCfg = release_mt|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|x86.ActiveCfg = release_static|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|x64.Build.0 = release_mt|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release_delaysign|x86.ActiveCfg = release_mt|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.release_mt|Any CPU.ActiveCfg = Release|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.release_mt|Mixed Platforms.ActiveCfg = release_mt|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.release_mt|Win32.ActiveCfg = release_mt|Win32
@@ -378,15 +291,15 @@ Global
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release|Win32.ActiveCfg = Release|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release|Win32.Build.0 = Release|Win32
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release|x64.ActiveCfg = Release|Win32
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release|x64.ActiveCfg = Release|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Release|x86.ActiveCfg = Release|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Any CPU.ActiveCfg = smtcomp|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Any CPU.ActiveCfg = Release|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Mixed Platforms.ActiveCfg = smtcomp|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Mixed Platforms.ActiveCfg = Release|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Mixed Platforms.Build.0 = smtcomp|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Mixed Platforms.Build.0 = Release|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Win32.ActiveCfg = smtcomp|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|Win32.ActiveCfg = Release|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|x64.ActiveCfg = smtcomp|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|x64.ActiveCfg = Release|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|x64.Build.0 = smtcomp|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|x64.Build.0 = Release|x64
-		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|x86.ActiveCfg = smtcomp|x64
+		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Setup|x86.ActiveCfg = Release|x64
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Trace|Any CPU.ActiveCfg = Release|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Trace|Mixed Platforms.ActiveCfg = Release|Win32
 		{9E76526D-EDA2-4B88-9616-A8FC08F31071}.Trace|Win32.ActiveCfg = Release|Win32
@@ -400,12 +313,6 @@ Global
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.commercial|x64.ActiveCfg = commercial|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.commercial|x64.Build.0 = commercial|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.commercial|x86.ActiveCfg = commercial|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.debug_opt|Any CPU.ActiveCfg = Debug|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.debug_opt|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.debug_opt|Win32.ActiveCfg = Debug|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.debug_opt|Win32.Build.0 = Debug|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.debug_opt|x64.ActiveCfg = Debug|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.debug_opt|x86.ActiveCfg = Debug|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Debug|Any CPU.Build.0 = Debug|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
@@ -415,35 +322,21 @@ Global
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Debug|x64.ActiveCfg = Debug|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Debug|x64.Build.0 = Debug|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Debug|x86.ActiveCfg = Debug|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_64|Any CPU.ActiveCfg = external_64|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_64|Mixed Platforms.ActiveCfg = external_64|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_64|Mixed Platforms.Build.0 = external_64|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_64|Win32.ActiveCfg = external_64|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_64|x64.ActiveCfg = external_64|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_64|x64.Build.0 = external_64|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_64|x86.ActiveCfg = external_64|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|Any CPU.ActiveCfg = external_dbg|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|Any CPU.Build.0 = external_dbg|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|Mixed Platforms.ActiveCfg = external_dbg|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|Mixed Platforms.Build.0 = external_dbg|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|Win32.ActiveCfg = external_dbg|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|Win32.Build.0 = external_dbg|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|x64.ActiveCfg = external_dbg|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external_dbg|x86.ActiveCfg = external_dbg|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|Any CPU.ActiveCfg = external|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|Any CPU.Build.0 = external|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|Mixed Platforms.ActiveCfg = external|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|Mixed Platforms.Build.0 = external|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|Win32.ActiveCfg = external|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|Win32.Build.0 = external|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|x64.ActiveCfg = Release|Win32
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|x64.ActiveCfg = external|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|x86.ActiveCfg = external|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|x64.Build.0 = external|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.external|x86.ActiveCfg = external|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|Any CPU.ActiveCfg = Release|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|Mixed Platforms.ActiveCfg = Release|Win32
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|Win32.ActiveCfg = release_static|Win32
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|Win32.ActiveCfg = release_mt|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|x64.ActiveCfg = Release|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|x64.Build.0 = Release|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|x86.ActiveCfg = release_static|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release_delaysign|x86.ActiveCfg = release_mt|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.release_mt|Any CPU.ActiveCfg = release_mt|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.release_mt|Any CPU.Build.0 = release_mt|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.release_mt|Mixed Platforms.ActiveCfg = release_mt|Win32
@@ -461,13 +354,13 @@ Global
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release|x64.ActiveCfg = Release|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release|x64.Build.0 = Release|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Release|x86.ActiveCfg = Release|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Any CPU.ActiveCfg = smtcomp|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Any CPU.ActiveCfg = trace|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Mixed Platforms.ActiveCfg = smtcomp|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Mixed Platforms.ActiveCfg = trace|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Mixed Platforms.Build.0 = smtcomp|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Mixed Platforms.Build.0 = trace|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Win32.ActiveCfg = smtcomp|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|Win32.ActiveCfg = trace|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|x64.ActiveCfg = smtcomp|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|x64.ActiveCfg = trace|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|x64.Build.0 = smtcomp|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|x64.Build.0 = trace|x64
-		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|x86.ActiveCfg = smtcomp|x64
+		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Setup|x86.ActiveCfg = trace|x64
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Trace|Any CPU.ActiveCfg = Release|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Trace|Mixed Platforms.ActiveCfg = Release|Win32
 		{0BF8CB94-61C7-4545-AE55-C58D858AA8B6}.Trace|Win32.ActiveCfg = trace|Win32
@@ -482,13 +375,6 @@ Global
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.commercial|x64.ActiveCfg = commercial|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.commercial|x64.Build.0 = commercial|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.commercial|x86.ActiveCfg = commercial|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.debug_opt|Any CPU.ActiveCfg = debug_opt|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.debug_opt|Mixed Platforms.ActiveCfg = debug_opt|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.debug_opt|Mixed Platforms.Build.0 = debug_opt|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.debug_opt|Win32.ActiveCfg = debug_opt|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.debug_opt|Win32.Build.0 = debug_opt|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.debug_opt|x64.ActiveCfg = debug_opt|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.debug_opt|x86.ActiveCfg = debug_opt|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Debug|Any CPU.Build.0 = Debug|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
@@ -498,36 +384,22 @@ Global
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Debug|x64.ActiveCfg = Debug|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Debug|x64.Build.0 = Debug|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Debug|x86.ActiveCfg = Debug|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|Any CPU.ActiveCfg = external_64|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|Mixed Platforms.ActiveCfg = external_64|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|Mixed Platforms.Build.0 = external_64|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|Win32.ActiveCfg = external_64|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|Win32.Build.0 = external_64|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|x64.ActiveCfg = external_64|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|x64.Build.0 = external_64|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_64|x86.ActiveCfg = external_64|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_dbg|Any CPU.ActiveCfg = external_dbg|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_dbg|Mixed Platforms.ActiveCfg = external_dbg|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_dbg|Mixed Platforms.Build.0 = external_dbg|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_dbg|Win32.ActiveCfg = external_dbg|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_dbg|Win32.Build.0 = external_dbg|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_dbg|x64.ActiveCfg = external_dbg|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external_dbg|x86.ActiveCfg = external_dbg|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|Any CPU.ActiveCfg = external|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|Any CPU.Build.0 = external|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|Mixed Platforms.ActiveCfg = external|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|Mixed Platforms.Build.0 = external|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|Win32.ActiveCfg = external|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|Win32.Build.0 = external|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|x64.ActiveCfg = external|Win32
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|x64.ActiveCfg = external|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|x86.ActiveCfg = external|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|x64.Build.0 = external|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Any CPU.ActiveCfg = Release_delaysign|Win32
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.external|x86.ActiveCfg = external|Win32
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Mixed Platforms.ActiveCfg = Release_delaysign|Win32
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Any CPU.ActiveCfg = release_mt|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Mixed Platforms.Build.0 = Release_delaysign|Win32
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Mixed Platforms.ActiveCfg = release_mt|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Win32.ActiveCfg = Release_delaysign|Win32
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Mixed Platforms.Build.0 = release_mt|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|x64.ActiveCfg = Release_delaysign|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|Win32.ActiveCfg = release_mt|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|x64.Build.0 = Release_delaysign|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|x64.ActiveCfg = release_mt|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|x86.ActiveCfg = Release_delaysign|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|x64.Build.0 = release_mt|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release_delaysign|x86.ActiveCfg = release_mt|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.release_mt|Any CPU.ActiveCfg = release_mt|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.release_mt|Mixed Platforms.ActiveCfg = release_mt|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.release_mt|Win32.ActiveCfg = release_mt|Win32
@@ -543,13 +415,13 @@ Global
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release|x64.ActiveCfg = Release|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release|x64.Build.0 = Release|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Release|x86.ActiveCfg = Release|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Any CPU.ActiveCfg = smtcomp|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Any CPU.ActiveCfg = Trace|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Mixed Platforms.ActiveCfg = smtcomp|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Mixed Platforms.ActiveCfg = Trace|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Mixed Platforms.Build.0 = smtcomp|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Mixed Platforms.Build.0 = Trace|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Win32.ActiveCfg = smtcomp|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|Win32.ActiveCfg = Trace|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|x64.ActiveCfg = smtcomp|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|x64.ActiveCfg = Trace|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|x64.Build.0 = smtcomp|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|x64.Build.0 = Trace|x64
-		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|x86.ActiveCfg = smtcomp|x64
+		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Setup|x86.ActiveCfg = Trace|x64
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Trace|Any CPU.ActiveCfg = Trace|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Trace|Mixed Platforms.ActiveCfg = Trace|Win32
 		{F008F2C4-D652-4A58-8DEF-DB83E2355454}.Trace|Win32.ActiveCfg = Trace|Win32
@@ -561,41 +433,22 @@ Global
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.commercial|Win32.ActiveCfg = commercial|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.commercial|x64.ActiveCfg = commercial|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.commercial|x86.ActiveCfg = commercial|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.debug_opt|Any CPU.ActiveCfg = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.debug_opt|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.debug_opt|Mixed Platforms.Build.0 = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.debug_opt|Win32.ActiveCfg = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.debug_opt|Win32.Build.0 = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.debug_opt|x64.ActiveCfg = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.debug_opt|x86.ActiveCfg = Debug|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|Any CPU.Build.0 = Debug|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|Win32.Build.0 = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|x64.ActiveCfg = Debug|Win32
+		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|x64.ActiveCfg = Debug|x64
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Debug|x86.ActiveCfg = Debug|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_64|Any CPU.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_64|Mixed Platforms.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_64|Mixed Platforms.Build.0 = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_64|Win32.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_64|Win32.Build.0 = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_64|x64.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_64|x86.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_dbg|Any CPU.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_dbg|Mixed Platforms.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_dbg|Mixed Platforms.Build.0 = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_dbg|Win32.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_dbg|x64.ActiveCfg = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external_dbg|x86.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|Any CPU.ActiveCfg = external|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|Any CPU.Build.0 = external|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|Mixed Platforms.ActiveCfg = external|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|Mixed Platforms.Build.0 = external|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|Win32.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|Win32.Build.0 = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|x64.ActiveCfg = Release|Win32
+		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|x64.ActiveCfg = external|x64
+		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|x64.Build.0 = external|x64
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.external|x86.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release_delaysign|Any CPU.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release_delaysign|Mixed Platforms.ActiveCfg = Release|Win32
@@ -613,14 +466,15 @@ Global
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release|Win32.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release|Win32.Build.0 = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release|x64.ActiveCfg = Release|Win32
+		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release|x64.ActiveCfg = Release|x64
+		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release|x64.Build.0 = Release|x64
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Release|x86.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|Any CPU.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|Mixed Platforms.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|Mixed Platforms.Build.0 = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|Win32.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|Win32.Build.0 = Release|Win32
-		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|x64.ActiveCfg = Release|Win32
+		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|x64.ActiveCfg = Release|x64
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Setup|x86.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Trace|Any CPU.ActiveCfg = Release|Win32
 		{7C154132-AAAB-4F60-B652-F8C51A63D244}.Trace|Mixed Platforms.ActiveCfg = Release|Win32
@@ -636,13 +490,6 @@ Global
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.commercial|Win32.ActiveCfg = Release|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.commercial|x64.ActiveCfg = Release|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.commercial|x86.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.debug_opt|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.debug_opt|Any CPU.Build.0 = Debug|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.debug_opt|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.debug_opt|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.debug_opt|Win32.ActiveCfg = Debug|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.debug_opt|x64.ActiveCfg = Debug|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.debug_opt|x86.ActiveCfg = Debug|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -652,28 +499,14 @@ Global
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Debug|x64.ActiveCfg = Debug|x64
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Debug|x64.Build.0 = Debug|x64
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|Any CPU.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|Any CPU.Build.0 = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|Mixed Platforms.Build.0 = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|Win32.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|x64.ActiveCfg = external_64|x64
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|x64.Build.0 = external_64|x64
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_64|x86.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_dbg|Any CPU.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_dbg|Any CPU.Build.0 = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_dbg|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_dbg|Mixed Platforms.Build.0 = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_dbg|Win32.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_dbg|x64.ActiveCfg = Release|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external_dbg|x86.ActiveCfg = Release|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|Any CPU.ActiveCfg = external|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|Any CPU.Build.0 = external|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|Mixed Platforms.ActiveCfg = external|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|Mixed Platforms.Build.0 = external|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|Win32.ActiveCfg = external|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|Win32.Build.0 = external|Any CPU
-		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|x64.ActiveCfg = Release|Any CPU
+		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|x64.ActiveCfg = external|x64
+		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|x64.Build.0 = external|x64
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.external|x86.ActiveCfg = Release|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Release_delaysign|Any CPU.ActiveCfg = Release|Any CPU
 		{EC3DB697-B734-42F7-9468-5B62821EEB5A}.Release_delaysign|Any CPU.Build.0 = Release|Any CPU
@@ -719,13 +552,6 @@ Global
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.commercial|x64.ActiveCfg = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.commercial|x86.ActiveCfg = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.commercial|x86.Build.0 = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.debug_opt|Any CPU.ActiveCfg = Debug|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.debug_opt|Mixed Platforms.ActiveCfg = Debug|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.debug_opt|Mixed Platforms.Build.0 = Debug|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.debug_opt|Win32.ActiveCfg = Debug|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.debug_opt|x64.ActiveCfg = Debug|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.debug_opt|x86.ActiveCfg = Debug|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.debug_opt|x86.Build.0 = Debug|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -734,25 +560,11 @@ Global
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Debug|x64.Build.0 = Debug|x64
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Debug|x86.ActiveCfg = Debug|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Debug|x86.Build.0 = Debug|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_64|Any CPU.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_64|Mixed Platforms.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_64|Mixed Platforms.Build.0 = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_64|Win32.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_64|x64.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_64|x86.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_64|x86.Build.0 = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_dbg|Any CPU.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_dbg|Mixed Platforms.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_dbg|Mixed Platforms.Build.0 = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_dbg|Win32.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_dbg|x64.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_dbg|x86.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external_dbg|x86.Build.0 = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|Any CPU.ActiveCfg = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|Mixed Platforms.ActiveCfg = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|Mixed Platforms.Build.0 = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|Win32.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|x64.ActiveCfg = Release|x86
+		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|x64.ActiveCfg = Release|x64
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|x86.ActiveCfg = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.external|x86.Build.0 = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Release_delaysign|Any CPU.ActiveCfg = Release|x86
@@ -781,7 +593,7 @@ Global
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Setup|Mixed Platforms.ActiveCfg = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Setup|Mixed Platforms.Build.0 = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Setup|Win32.ActiveCfg = Release|x86
-		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Setup|x64.ActiveCfg = Release|x86
+		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Setup|x64.ActiveCfg = Release|x64
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Setup|x86.ActiveCfg = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Setup|x86.Build.0 = Release|x86
 		{B408E4BF-338D-446D-8D28-0DAB9BE91182}.Trace|Any CPU.ActiveCfg = Release|x86