arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix PreprocessorDefinitions for ARM 

AppVeyor error'd with "error MSB8022: Compiling Desktop applications for the ARM platform is not supported"
pull/461/head
Jeffrey Walton 2017-08-04 01:46:27 -04:00
parent 7f9476ac60
commit 5014090f9d
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
5 changed files with 69 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.appveyor.yml
View File

@ -25,9 +25,6 @@ image:
build: off build: off
# Extra copy gyrations due to broken MSbuild. Run 'make appveyor' to update the vcxproj files. Also see
# https://stackoverflow.com/questions/45474857/why-does-appveyor-use-vs2010-tools-for-vs2015-image
test_script: test_script:
- cmd: >- - cmd: >-
@ -42,10 +39,6 @@ test_script:
cryptest.exe tv all cryptest.exe tv all
# Right now, we have a few failures that we don't know how to workaround.
# - https://stackoverflow.com/questions/43441273/how-to-run-vcupgrade-before-appveyor-build
# - https://stackoverflow.com/questions/43423761/cant-perform-64-bit-testing-under-appveyor
notifications: notifications:
- provider: Email - provider: Email
to: to:

17
cryptdll.vcxproj
View File

@ -12,6 +12,10 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
@ -20,6 +24,10 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<!-- Microsoft documentation clearly shows the Global property group --> <!-- Microsoft documentation clearly shows the Global property group -->
<!-- preceeds the import of Cpp.Default.props and Cpp.props --> <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
@ -123,6 +131,15 @@
<ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers> <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- ARM Configurations -->
<ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
<ClCompile>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineARM</TargetMachine>
</Link>
</ItemDefinitionGroup>
<!-- X64 Configurations --> <!-- X64 Configurations -->
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'" Label="X64 Configuration"> <ItemDefinitionGroup Condition="'$(Platform)'=='x64'" Label="X64 Configuration">
<Link> <Link>

17
cryptest.vcxproj
View File

@ -12,6 +12,10 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
@ -20,6 +24,10 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DLL-Import Debug|Win32"> <ProjectConfiguration Include="DLL-Import Debug|Win32">
<Configuration>DLL-Import Debug</Configuration> <Configuration>DLL-Import Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
@ -177,6 +185,15 @@
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- ARM Configurations -->
<ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
<ClCompile>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineARM</TargetMachine>
</Link>
</ItemDefinitionGroup>
<!-- FIPS Validated Warning --> <!-- FIPS Validated Warning -->
<ItemDefinitionGroup Label="FIPS Warning"> <ItemDefinitionGroup Label="FIPS Warning">
<PreBuildEvent Condition="'$(Configuration)'=='DLL-Import Debug' Or '$(Configuration)'=='DLL-Import Release'"> <PreBuildEvent Condition="'$(Configuration)'=='DLL-Import Debug' Or '$(Configuration)'=='DLL-Import Release'">

18
cryptlib.vcxproj
View File

@ -12,6 +12,10 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
@ -20,6 +24,11 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
</ItemGroup>
<ProjectConfiguration Include="DLL-Import Debug|Win32"> <ProjectConfiguration Include="DLL-Import Debug|Win32">
<Configuration>DLL-Import Debug</Configuration> <Configuration>DLL-Import Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
@ -159,6 +168,15 @@
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- ARM Configurations -->
<ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
<ClCompile>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineARM</TargetMachine>
</Link>
</ItemDefinitionGroup>
<!-- Original File with special treatment --> <!-- Original File with special treatment -->
<!-- Source Files --> <!-- Source Files -->
<!-- The order of the first three matters --> <!-- The order of the first three matters -->

17
dlltest.vcxproj
View File

@ -12,6 +12,10 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
@ -20,6 +24,10 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<!-- Microsoft documentation clearly shows the Global property group --> <!-- Microsoft documentation clearly shows the Global property group -->
<!-- preceeds the import of Cpp.Default.props and Cpp.props --> <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
@ -123,6 +131,15 @@
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- ARM Configurations -->
<ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
<ClCompile>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineARM</TargetMachine>
</Link>
</ItemDefinitionGroup>
<!-- Source Files --> <!-- Source Files -->
<ItemGroup> <ItemGroup>
<ClCompile Include="dlltest.cpp" /> <ClCompile Include="dlltest.cpp" />