From 151fe5b6173a54fda6c78055ed753342bcf2c224 Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Fri, 12 Aug 2016 09:49:25 +0200
Subject: [PATCH] enable asm for windows openssl builds

also choose the correct target for 32bits
---
 windows.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/windows.mk b/windows.mk
index 7cfd97e..8b3798c 100644
--- a/windows.mk
+++ b/windows.mk
@@ -47,8 +47,8 @@ doit:
 		curl -L -O "https://www.openssl.org/source/openssl-$(OPENSSLVERSION).tar.gz" && \
 	tar xfa openssl-$(OPENSSLVERSION).tar.gz && \
 	cd openssl-$(OPENSSLVERSION) && \
-	CROSS_COMPILE="$(HOST)-" ./Configure mingw64 no-asm no-ssl2 no-ssl3 no-engines shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \
-	make all install_sw && \
+	CROSS_COMPILE="$(HOST)-" ./Configure mingw$(64) no-ssl2 no-ssl3 no-engines shared --prefix=$(PWD)/tmp$(ARCH)/root -static-libgcc && \
+	make depend all install_sw && \
 	cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \
 	rm -rf $(PWD)/tmp$(ARCH)/root/ssl/ && \
 	rm $(PWD)/tmp$(ARCH)/root/bin/openssl.exe && \
@@ -70,7 +70,7 @@ doit:
 	$(MAKE) -f windows.mk doit ARCH=32 HOST=i686-w64-mingw32 CHECK=check
 
 64bit:
-	$(MAKE) -f windows.mk doit ARCH=64 HOST=x86_64-w64-mingw32 CHECK=check
+	$(MAKE) -f windows.mk doit ARCH=64 HOST=x86_64-w64-mingw32 64=64 CHECK=check
 
 upload:
 	@if test ! -d "$(YUBICO_GITHUB_REPO)"; then \