projects cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@250 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 51 insertions, 342 deletions

diff --git a/plugins/Dbx_tree/encryption/ARC4.vcxproj b/plugins/Dbx_tree/encryption/ARC4.vcxproj
index fafea0e915..f913f0406a 100644
--- a/plugins/Dbx_tree/encryption/ARC4.vcxproj
+++ b/plugins/Dbx_tree/encryption/ARC4.vcxproj
@@ -19,21 +19,17 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>dbx_tree_ARC4</ProjectName>

+    <ProjectName>Dbx_tree_ARC4</ProjectName>

     <ProjectGUID>{F60935E3-8F27-46E2-8598-013E7D4C90E7}</ProjectGUID>

-    <RootNamespace>dbx_tree_encryption</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

@@ -54,34 +50,18 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\encryption\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\Encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\Encryption\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\encryption\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\Encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\Encryption\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

@@ -90,78 +70,36 @@
       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -169,40 +107,22 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX86</TargetMachine>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -210,39 +130,22 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/Dbx_tree/encryption/Cast128.vcxproj b/plugins/Dbx_tree/encryption/Cast128.vcxproj
index ca8a3568fb..9bac84a123 100644
--- a/plugins/Dbx_tree/encryption/Cast128.vcxproj
+++ b/plugins/Dbx_tree/encryption/Cast128.vcxproj
@@ -19,21 +19,17 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>dbx_tree_Cast128</ProjectName>

+    <ProjectName>Dbx_tree_Cast128</ProjectName>

     <ProjectGUID>{7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}</ProjectGUID>

-    <RootNamespace>Cast128</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

@@ -54,34 +50,18 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\encryption\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\Encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\Encryption\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\encryption\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\Encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\Encryption\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

@@ -90,78 +70,36 @@
       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -169,40 +107,22 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX86</TargetMachine>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -210,39 +130,22 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/Dbx_tree/encryption/HC256.vcxproj b/plugins/Dbx_tree/encryption/HC256.vcxproj
index 12e1f0131f..7308a4617b 100644
--- a/plugins/Dbx_tree/encryption/HC256.vcxproj
+++ b/plugins/Dbx_tree/encryption/HC256.vcxproj
@@ -19,21 +19,17 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>dbx_tree_HC256</ProjectName>

+    <ProjectName>Dbx_tree_HC256</ProjectName>

     <ProjectGUID>{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}</ProjectGUID>

-    <RootNamespace>HC256</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>false</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

@@ -54,34 +50,18 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\encryption\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\Encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\Encryption\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\encryption\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\Encryption\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\Encryption\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>

-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.dll</TargetExt>

-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

@@ -90,78 +70,36 @@
       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -169,40 +107,22 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX86</TargetMachine>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -210,39 +130,22 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAsManaged>false</CompileAsManaged>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <OmitFramePointers>false</OmitFramePointers>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

       <StringPooling>true</StringPooling>

       <MinimalRebuild>true</MinimalRebuild>

-      <ExceptionHandling>Sync</ExceptionHandling>

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

-      <BufferSecurityCheck>true</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

-      <MapExports>false</MapExports>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>