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 optionspull/438/merge
Marcel Raad
Jeffrey Walton
parent
d9de314e86
commit
3485d2180d
|
|
@ -24,17 +24,14 @@
|
|||
<PlatformToolset>v100</PlatformToolset>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<!-- End of Visual Studio boilerplate -->
|
||||
|
||||
<!-- All Configurations -->
|
||||
<PropertyGroup Label="All Configurations">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
|
|
@ -46,7 +43,6 @@
|
|||
<OutDir>$(Platform)\DLL_Output\$(Configuration)\</OutDir>
|
||||
<IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- All Configurations -->
|
||||
<ItemDefinitionGroup Label="All Configurations">
|
||||
<ClCompile>
|
||||
|
|
@ -67,7 +63,6 @@
|
|||
<ImportLibrary>$(TargetDir)\cryptopp.lib</ImportLibrary>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Debug Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'" Label="Debug Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -83,7 +78,6 @@
|
|||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Release Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'" Label="Release Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -105,7 +99,6 @@
|
|||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- X86 Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'" Label="X86 Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -116,17 +109,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>
|
||||
|
||||
<!-- Win32/Debug cryptest.exe for DLL MAC'ing -->
|
||||
<!-- Broken at the moment; see http://stackoverflow.com/q/39900437 -->
|
||||
<!-- and http://stackoverflow.com/q/39929817/608639 -->
|
||||
|
|
@ -142,7 +130,6 @@
|
|||
Properties="Configuration=Debug;Platform=Win32;"/>
|
||||
</Target>
|
||||
-->
|
||||
|
||||
<ItemDefinitionGroup Condition="!Exists('Win32\Output\Debug\cryptest.exe')" Label="MAC tool">
|
||||
<PreBuildEvent>
|
||||
<Message>Creating Win32/Debug cryptest.exe for MAC computation</Message>
|
||||
|
|
@ -152,7 +139,6 @@
|
|||
</Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- DLL MAC'ing performed by cryptest.exe -->
|
||||
<ItemDefinitionGroup Label="DLL MAC">
|
||||
<PostBuildEvent>
|
||||
|
|
@ -165,7 +151,6 @@
|
|||
<Outputs>$(OutDir)cryptopp.mac.done;%(Outputs)</Outputs>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Original File with special treatment -->
|
||||
<ItemGroup>
|
||||
<CustomBuild Condition="'$(Platform)'=='x64' AND ('$(Configuration)'=='Debug' Or '$(Configuration)'=='Release')" Include="x64dll.asm">
|
||||
|
|
@ -174,7 +159,6 @@
|
|||
<Outputs>$(IntDir)x64dll.obj;%(Outputs)</Outputs>
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Source Files -->
|
||||
<ItemGroup>
|
||||
<ClCompile Include="pch.cpp">
|
||||
|
|
@ -239,7 +223,6 @@
|
|||
<ClCompile Include="strciphr.cpp" />
|
||||
<ClCompile Include="trdlocal.cpp" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Header Files -->
|
||||
<ItemGroup>
|
||||
<ClInclude Include="aes.h" />
|
||||
|
|
@ -310,7 +293,6 @@
|
|||
<ClInclude Include="trdlocal.h" />
|
||||
<ClInclude Include="words.h" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Back to Visual Studio boilerplate -->
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="cryptopp.rc" />
|
||||
|
|
@ -319,4 +301,4 @@
|
|||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@
|
|||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<!-- End of Visual Studio boilerplate -->
|
||||
|
||||
<!-- All Configurations -->
|
||||
<PropertyGroup Label="All Configurations">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
|
|
@ -60,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">
|
||||
|
|
@ -75,7 +73,6 @@
|
|||
<OutDir>$(Platform)\DLL_Output\Release\</OutDir>
|
||||
<IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- All Configurations -->
|
||||
<ItemDefinitionGroup Label="All Configurations">
|
||||
<ClCompile>
|
||||
|
|
@ -89,7 +86,6 @@
|
|||
<ErrorReporting>NoErrorReport</ErrorReporting>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Debug Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DLL-Import Debug'" Label="Debug Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -105,7 +101,6 @@
|
|||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Release Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='DLL-Import Release'" Label="Release Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -123,7 +118,6 @@
|
|||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- DLL-Import Overrides for Preprocessor -->
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='DLL-Import Debug'" Label="DLL Debug Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -135,7 +129,6 @@
|
|||
<PreprocessorDefinitions>NDEBUG;USE_PRECOMPILED_HEADERS;CRYPTOPP_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- X86 Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'" Label="X86 Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -146,19 +139,13 @@
|
|||
<ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- X64 Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'" Label="X64 Configuration">
|
||||
<ClCompile>
|
||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Original File with special treatment -->
|
||||
|
||||
<!-- Source Files -->
|
||||
<!-- The order of the first three matters -->
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -24,17 +24,14 @@
|
|||
<PlatformToolset>v100</PlatformToolset>
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<!-- End of Visual Studio boilerplate -->
|
||||
|
||||
<!-- All Configurations -->
|
||||
<PropertyGroup Label="All Configurations">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
|
|
@ -44,7 +41,6 @@
|
|||
<OutDir>$(Platform)\DLL_Output\$(Configuration)\</OutDir>
|
||||
<IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- All Configurations -->
|
||||
<ItemDefinitionGroup Label="All Configurations">
|
||||
<ClCompile>
|
||||
|
|
@ -61,7 +57,6 @@
|
|||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Debug Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'" Label="Debug Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -77,7 +72,6 @@
|
|||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- Release Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'" Label="Release Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -99,7 +93,6 @@
|
|||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!-- X86 Configurations -->
|
||||
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'" Label="X86 Configuration">
|
||||
<ClCompile>
|
||||
|
|
@ -110,24 +103,18 @@
|
|||
<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>
|
||||
|
||||
<!-- Source Files -->
|
||||
<ItemGroup>
|
||||
<ClCompile Include="dlltest.cpp" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Back to Visual Studio boilerplate -->
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
Loading…
Reference in New Issue