diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-10-06 16:59:50 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-10-06 16:59:50 -0400 |
| commit | b62637d08ed62863edf45b13311b3b6c9dfd98c8 (patch) | |
| tree | fc87446798129eb3d6185b23ef89bdcb568fac5c /cryptlib.vcxproj | |
| parent | c400c7b38d3ad7ec6e69df72da01b8292d23bd38 (diff) | |
| download | cryptopp-git-b62637d08ed62863edf45b13311b3b6c9dfd98c8.tar.gz | |
Fix x64masm.asm and x64dll.asm ASM with ARM-based MSBuilds (Issue 316)
Diffstat (limited to 'cryptlib.vcxproj')
| -rw-r--r-- | cryptlib.vcxproj | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj index 7ecc5511..0c0681a1 100644 --- a/cryptlib.vcxproj +++ b/cryptlib.vcxproj @@ -324,16 +324,14 @@ echo: >> adhoc.cpp.copied <Command>ml64.exe /c /nologo /D_M_X64 /W3 /Cx /Zi /Fo"$(IntDir)rdrand-x64.obj" "%(FullPath)"</Command>
<Outputs>$(IntDir)\rdrand-x64.obj</Outputs>
</CustomBuild>
- <CustomBuild Include="x64dll.asm">
- <ExcludedFromBuild Condition="'$(Configuration)'=='DLL-Import Debug' Or '$(Configuration)'=='DLL-Import Release'">true</ExcludedFromBuild>
- <Message Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">Building and assembling x64dll.asm</Message>
- <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>
+ <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>
- <CustomBuild Include="x64masm.asm">
- <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
+ <CustomBuild Condition="'$(Platform)'=='x64'" Include="x64masm.asm">
<Message>Building and Assembling x64masm.asm</Message>
- <Command>ml64.exe /c /nologo /D_M_X64 /W3 /Fo"$(IntDir)x64masm.obj" /Zi "%(FullPath)"</Command>
+ <Command>ml64.exe /c /nologo /D_M_X64 /W3 /Zi /Fo"$(IntDir)x64masm.obj" "%(FullPath)"</Command>
<Outputs>$(IntDir)x64masm.obj;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
|