From d6ef6092365f0cce9154b4f1db591e969a1af9f3 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Sat, 13 Oct 2018 19:45:27 +0200 Subject: [PATCH] Linking crypto32 and libhidapi for Windows builds --- monero | 2 +- monero-wallet-gui.pro | 2 ++ windeploy_helper.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/monero b/monero index 8512a835..77ef8c18 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 8512a83572094f96aff95e02db359914a37c3c71 +Subproject commit 77ef8c1839e1984471605e072a20e04d1e7eb6f8 diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 80396533..25721c7c 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -256,6 +256,8 @@ win32 { -lws2_32 \ -lwsock32 \ -lIphlpapi \ + -lcrypt32 \ + -lhidapi \ -lgdi32 !contains(QMAKE_TARGET.arch, x86_64) { diff --git a/windeploy_helper.sh b/windeploy_helper.sh index 55c872bc..b5833831 100644 --- a/windeploy_helper.sh +++ b/windeploy_helper.sh @@ -23,7 +23,7 @@ else ICU_FILES=(libicudtd61.dll libicuind61.dll libicuiod61.dll libicutud61.dll libicuucd61.dll) fi -FILES=(zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll) +FILES=(zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll) platform=$(get_platform)