From d24babdecc7b83614b6c3bf5c1992b8a3628a7e8 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sat, 30 Apr 2016 22:48:14 -0400
Subject: [PATCH] Force include <sdkddkver.h>, detect X86 and X64 (in addition
 to x86 and x64)

---
 cryptest.nmake | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/cryptest.nmake b/cryptest.nmake
index f9f48c35..09eb3e44 100644
--- a/cryptest.nmake
+++ b/cryptest.nmake
@@ -42,10 +42,10 @@ RM = del.exe
 #   - /DWINAPI_FAMILY=WINAPI_FAMILY_APP
 # To test Windows Phone, use the following CXXFLAGS:
 #   - /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
-# To test Surface Pro and WinRT (ARM), use the following CXXFLAGS:
+# To test Surface RT (ARM tablet), use the following CXXFLAGS:
 #   - /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
 
-CXXFLAGS = /nologo /W4 /D_MBCS /Zi /TP /EHsc /MD
+CXXFLAGS = /nologo /W4 /D_MBCS /Zi /TP /EHsc /MD /FI sdkddkver.h /FI winapifamily.h
 LDFLAGS = /nologo /SUBSYSTEM:CONSOLE
 ARFLAGS = /nologo
 LDLIBS =
@@ -66,31 +66,31 @@ PLATFORM = x64
 !MESSAGE ******************************
 !MESSAGE
 
-!IF "$(PLATFORM)" == "x86"
-# CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
-# CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h /DWINAPI_FAMILY=WINAPI_FAMILY_APP
+!IF "$(PLATFORM)" == "x86" || "$(PLATFORM)" == "X86"
+# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
+# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP
 AS = ml.exe
 ASFLAGS = /nologo /D_M_X86 /W3 /Cx /Zi /safeseh
-LIB_SRCS = $(LIB_SRCS) rdrand.cpp
+LIB_SRCS = $(LIB_SRCS) rdrand.cpp rdrand.asm
 LIB_OBJS = $(LIB_OBJS) rdrand.obj rdrand-x86.obj
 LDLIBS = $(LDLIBS) ws2_32.lib kernel32.lib
 !ENDIF
 
 # May need $(VCINSTALLDIR)\bin\amd64\ml64.exe
-!IF "$(PLATFORM)" == "x64"
-# CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
-# CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h /DWINAPI_FAMILY=WINAPI_FAMILY_APP
+!IF "$(PLATFORM)" == "x64" || "$(PLATFORM)" == "X64"
+# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
+# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP
 AS = ml64.exe
 ASFLAGS = /nologo /D_M_X64 /W3 /Cx /Zi
-LIB_SRCS = $(LIB_SRCS) rdrand.cpp
+LIB_SRCS = $(LIB_SRCS) rdrand.cpp rdrand.asm
 LIB_OBJS = $(LIB_OBJS) rdrand.obj rdrand-x64.obj x64masm.obj x64dll.obj
 LDLIBS = $(LDLIBS) ws2_32.lib kernel32.lib
 !ENDIF
 
 !IF "$(PLATFORM)" == "ARM"
-# CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
-# CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
-# CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h /DWINAPI_FAMILY=WINAPI_FAMILY_APP
+# CXXFLAGS = $(CXXFLAGS) /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
+# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
+# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP
 # LDLIBS = $(LDLIBS) ws2_32.lib
 !ENDIF