monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1646

Browse source 
d6ef609 Linking crypto32 and libhidapi for Windows builds (skftn)
This commit is contained in:
luigi1111 2018-10-13 13:43:36 -05:00
commit 7a3855700e
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
monero

@ -1 +1 @@
Subproject commit 8512a83572094f96aff95e02db359914a37c3c71 Subproject commit 77ef8c1839e1984471605e072a20e04d1e7eb6f8

2
monero-wallet-gui.pro
View file

@ -256,6 +256,8 @@ win32 {
-lws2_32 \ -lws2_32 \
-lwsock32 \ -lwsock32 \
-lIphlpapi \ -lIphlpapi \
-lcrypt32 \
-lhidapi \
-lgdi32 -lgdi32
!contains(QMAKE_TARGET.arch, x86_64) { !contains(QMAKE_TARGET.arch, x86_64) {

2
windeploy_helper.sh
View file

@ -23,7 +23,7 @@ else
ICU_FILES=(libicudtd62.dll libicuind62.dll libicuiod62.dll libicutud62.dll libicuucd62.dll) ICU_FILES=(libicudtd62.dll libicuind62.dll libicuiod62.dll libicutud62.dll libicuucd62.dll)
fi 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) platform=$(get_platform)