Fix Visual Studio project file issues (#446)

- don't enable SSE2 explicitly for x64, it's always enabled and causes
  warnings (issue #445)
- remove newlines in project files that Visual Studio doesn't like and
  removes on every change to project options

1 files changed, 0 insertions, 18 deletions

diff --git a/cryptest.vcxproj b/cryptest.vcxproj
index 4e958f07..8916b34c 100644
--- a/cryptest.vcxproj
+++ b/cryptest.vcxproj
@@ -34,7 +34,6 @@
       <Platform>x64</Platform>

     </ProjectConfiguration>

   </ItemGroup>

-

   <PropertyGroup Label="Globals">

     <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>

     <RootNamespace>cryptest</RootNamespace>

@@ -43,7 +42,6 @@
   </PropertyGroup>

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

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

-

   <ImportGroup Label="ExtensionSettings">

     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />

   </ImportGroup>

@@ -52,7 +50,6 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <!-- End of Visual Studio boilerplate -->

-

   <!-- All Configurations -->

   <PropertyGroup Label="All Configurations">

     <ConfigurationType>Application</ConfigurationType>

@@ -62,7 +59,6 @@
     <CharacterSet>MultiByte</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

-

   <!-- Intermediate and Output directories -->

   <!-- Cryptlib and Cryptest need extra care due to Non-DLL/DLL configs -->

   <PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'" Label="Non-DLL Directories">

@@ -77,7 +73,6 @@
     <OutDir>$(Platform)\DLL_Output\Release\</OutDir>

     <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>

   </PropertyGroup>

-

   <!-- All Configurations -->

   <ItemDefinitionGroup Label="All Configurations">

     <ClCompile>

@@ -97,7 +92,6 @@
       <SubSystem>Console</SubSystem>

     </Link>

   </ItemDefinitionGroup>

-

   <!-- Debug Configurations -->

   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DLL-Import Debug'" Label="Debug Configuration">

     <ClCompile>

@@ -113,7 +107,6 @@
       <Culture>0x0409</Culture>

     </ResourceCompile>

   </ItemDefinitionGroup>

-

   <!-- Release Configurations -->

   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='DLL-Import Release'" Label="Release Configuration">

     <ClCompile>

@@ -135,7 +128,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

     </Link>

   </ItemDefinitionGroup>

-

   <!-- DLL-Import Overrides for Preprocessor and Libraries -->

   <ItemDefinitionGroup Condition="'$(Configuration)'=='DLL-Import Debug'" Label="DLL Debug Configuration">

     <ClCompile>

@@ -155,7 +147,6 @@
       <AdditionalDependencies>cryptopp.lib;cryptlib.lib;Ws2_32.lib</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

-

   <!-- X86 Configurations -->

   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'" Label="X86 Configuration">

     <ClCompile>

@@ -166,17 +157,12 @@
       <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>

     </Link>

   </ItemDefinitionGroup>

-

   <!-- X64 Configurations -->

   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'" Label="X64 Configuration">

-    <ClCompile>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

-    </ClCompile>

     <Link>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

-

   <!-- FIPS Validated Warning -->

   <ItemDefinitionGroup Label="FIPS Warning">

     <PreBuildEvent Condition="'$(Configuration)'=='DLL-Import Debug' Or '$(Configuration)'=='DLL-Import Release'">

@@ -190,14 +176,12 @@
       </Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

-

   <!-- Target for Appvoyer                           -->

   <!-- The rule copies cryptest.exe to the project   -->

   <!-- root directory so it can be executed in place -->

   <Target Name="CopyCryptestToRoot">

     <Exec Command="copy $(Platform)\Output\$(Configuration)\cryptest.exe $(SolutionDir)" />

   </Target>

-

   <!-- Source Files -->

   <ItemGroup>

     <ClCompile Include="adhoc.cpp" />

@@ -215,14 +199,12 @@
     <ClCompile Include="validat2.cpp" />

     <ClCompile Include="validat3.cpp" />

   </ItemGroup>

-

   <!-- Header Files -->

   <ItemGroup>

     <ClInclude Include="bench.h" />

     <ClInclude Include="factory.h" />

     <ClInclude Include="validate.h" />

   </ItemGroup>

-

   <!-- Test Files -->

   <ItemGroup>

     <None Include="TestVectors\aes.txt" />