From: simon@yubico.com <simon@yubico.com@b62f149e-849f-11dd-9899-c7ba65f7c4c7>
Date: Thu, 25 Nov 2010 15:30:44 +0000 (+0000)
Subject: Support 64-bit.
X-Git-Tag: yubikey-personalisation_1.3.5-1~5^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3810e5f021f685b41d273e4abfa5e0a786dea27;p=yubikey-personalization

Support 64-bit.


git-svn-id: https://yubikey-personalization.googlecode.com/svn/trunk@279 b62f149e-849f-11dd-9899-c7ba65f7c4c7
---

diff --git a/ykpers4win.mk b/ykpers4win.mk
index 6cd229d..d08e349 100644
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -1,22 +1,28 @@
-ykpers4win32:
+ykpers4win:
 	rm -rf tmp && mkdir tmp && cd tmp && \
-	wget -q http://yubico-c.googlecode.com/files/libyubikey-1.7.tar.gz && \
+	wget http://yubico-c.googlecode.com/files/libyubikey-1.7.tar.gz && \
 	tar xfa libyubikey-1.7.tar.gz && \
 	cd libyubikey-1.7 && \
-	./configure --host=i686-w64-mingw32 --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
-	make install check && \
+	./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
+	make install $(CHECK) && \
 	cd .. && \
-	wget -q http://yubikey-personalization.googlecode.com/files/libusb-1.0.8-windows.tar.bz2 && \
+	wget http://yubikey-personalization.googlecode.com/files/libusb-1.0.8-windows.tar.bz2 && \
 	tar xfa libusb-1.0.8-windows.tar.bz2 && \
 	cd libusb-1.0.8 && \
-	./configure --host=i686-w64-mingw32 --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
+	./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
 	make install && \
 	cd .. && \
-	wget -q http://yubikey-personalization.googlecode.com/files/ykpers-1.3.5.tar.gz && \
+	wget http://yubikey-personalization.googlecode.com/files/ykpers-1.3.5.tar.gz && \
 	tar xfa ykpers-1.3.5.tar.gz && \
 	cd ykpers-1.3.5/ && \
-	PKG_CONFIG_PATH=$(PWD)/tmp/root/lib/pkgconfig ./configure --host=i686-w64-mingw32 --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root && \
-	make install check && \
+	PKG_CONFIG_PATH=$(PWD)/tmp/root/lib/pkgconfig ./configure --host=$(HOST) --build=x86_64-unknown-linux-gnu --prefix=$(PWD)/tmp/root CPPFLAGS=-I$(PWD)/tmp/root/include && \
+	make install $(CHECK) && \
 	cd .. && \
 	cd root && \
-	zip -r ../../ykpers-1.3.5-win32.zip *
+	zip -r ../../ykpers-1.3.5-win$(ARCH).zip *
+
+ykpers4win32:
+	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i686-w64-mingw32 CHECK=check
+
+ykpers4win64:
+	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=64 HOST=x86_64-w64-mingw32 CHECK=