Support 64-bit.

diff --git a/ykpers4win.mk b/ykpers4win.mk
index 6cd229d1df42f8ede9209ef63fbd3d1dee19061a..d08e34960a5a3d0de0b7c62ea0bf3fe57f04fde3 100644 (file)
--- 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=