Merge pull request #1644

97cfbf5 Linking crypto32 and libhidapi for Windows builds (skftn)
pull/2/head
luigi1111 6 years ago
commit 7adeb694c1
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

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

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

@ -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)