From d00be538c5bbfcec282932c11cf9169b42489d0a Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sat, 8 Oct 2016 13:55:37 -0400
Subject: [PATCH] Fix x64dll.asm ASM with ARM-based MSBuilds (Issue 316)

---
 cryptdll.vcxproj | 9 ++++-----
 1 file 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>