diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-10-13 13:23:07 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-10-13 13:23:07 -0500 |
| commit | 7adeb694c17511ffcb1d3d0c0038f5f8b8684a5f (patch) | |
| tree | 3195b146b35f97939de734d7943d1cc2b4208fd6 | |
| parent | ba2c9b5beb01cec1ade56c9271dd87b2dc43e37b (diff) | |
| parent | 97cfbf5c50ac5f1c97ce631dd08b5c96c2824b08 (diff) | |
| download | monzero-gui-7adeb694c17511ffcb1d3d0c0038f5f8b8684a5f.tar.gz monzero-gui-7adeb694c17511ffcb1d3d0c0038f5f8b8684a5f.tar.xz monzero-gui-7adeb694c17511ffcb1d3d0c0038f5f8b8684a5f.zip | |
Merge pull request #1644
97cfbf5 Linking crypto32 and libhidapi for Windows builds (skftn)
| m--------- | monero | 0 | ||||
| -rw-r--r-- | monero-wallet-gui.pro | 2 | ||||
| -rw-r--r-- | windeploy_helper.sh | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/monero b/monero -Subproject 8512a83572094f96aff95e02db359914a37c3c7 +Subproject 77ef8c1839e1984471605e072a20e04d1e7eb6f 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 1ba09bd4..e0a3b3bb 100644 --- a/windeploy_helper.sh +++ b/windeploy_helper.sh @@ -23,7 +23,7 @@ else ICU_FILES=(libicudtd62.dll libicuind62.dll libicuiod62.dll libicutud62.dll libicuucd62.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) |