diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-10-08 13:55:37 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-10-08 13:55:37 -0400 |
| commit | d00be538c5bbfcec282932c11cf9169b42489d0a (patch) | |
| tree | 55c18b9edacad06bb7892f7acc5092315596d4cc /cryptdll.vcxproj | |
| parent | 7c735f660f286be7484b1da77a9f6c9c96d26cf5 (diff) | |
| download | cryptopp-git-d00be538c5bbfcec282932c11cf9169b42489d0a.tar.gz | |
Fix x64dll.asm ASM with ARM-based MSBuilds (Issue 316)
Diffstat (limited to 'cryptdll.vcxproj')
| -rw-r--r-- | cryptdll.vcxproj | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj index 040698ab..b1efa601 100644 --- a/cryptdll.vcxproj +++ b/cryptdll.vcxproj @@ -153,7 +153,6 @@ </PreBuildEvent>
</ItemDefinitionGroup>
-
<!-- DLL MAC'ing performed by cryptest.exe -->
<ItemDefinitionGroup Label="DLL MAC">
<PostBuildEvent>
@@ -169,10 +168,10 @@ <!-- Original File with special treatment -->
<ItemGroup>
- <CustomBuild Include="x64dll.asm">
- <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
- <Command Condition="'$(Platform)'=='x64'">ml64.exe /c /nologo /D_M_X64 /W3 /Fo"$(IntDir)x64dll.obj" /Zi "%(FullPath)"</Command>
- <Outputs Condition="'$(Platform)'=='x64'">$(IntDir)x64dll.obj;%(Outputs)</Outputs>
+ <CustomBuild Condition="'$(Platform)'=='x64' AND ('$(Configuration)'=='Debug' Or '$(Configuration)'=='Release')" Include="x64dll.asm">
+ <Message>Building and assembling x64dll.asm</Message>
+ <Command>ml64.exe /c /nologo /D_M_X64 /W3 /Zi /Fo"$(IntDir)x64dll.obj" "%(FullPath)"</Command>
+ <Outputs>$(IntDir)x64dll.obj</Outputs>
</CustomBuild>
</ItemGroup>
|