Merge pull request #2173

fbd6d68 build: Windows statically link gcc and c++ runtime (xiphon)
07bda54 build: Windows link against setupapi (hidapi dependency) (xipon)
This commit is contained in:
luigi1111 2019-05-27 13:34:22 -05:00
commit f197f507bc
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -255,7 +255,17 @@ win32 {
LIBS+=-L$$BOOST_PATH/lib LIBS+=-L$$BOOST_PATH/lib
LIBS+=-L$$BOOST_MINGW_PATH/lib LIBS+=-L$$BOOST_MINGW_PATH/lib
QMAKE_LFLAGS += -static-libgcc -static-libstdc++
LIBS+= \ LIBS+= \
-Wl,-Bdynamic \
-lwinscard \
-lws2_32 \
-lwsock32 \
-lIphlpapi \
-lcrypt32 \
-lhidapi \
-lgdi32 $$TREZOR_LINKER \
-Wl,-Bstatic \ -Wl,-Bstatic \
-lboost_serialization-mt \ -lboost_serialization-mt \
-lboost_thread-mt \ -lboost_thread-mt \
@ -272,17 +282,11 @@ win32 {
-licudt \ -licudt \
-licutu \ -licutu \
-liconv \ -liconv \
-lpthread \
-lsetupapi \
-lssl \ -lssl \
-lsodium \ -lsodium \
-lcrypto \ -lcrypto
-Wl,-Bdynamic \
-lwinscard \
-lws2_32 \
-lwsock32 \
-lIphlpapi \
-lcrypt32 \
-lhidapi \
-lgdi32 $$TREZOR_LINKER
!contains(QMAKE_TARGET.arch, x86_64) { !contains(QMAKE_TARGET.arch, x86_64) {
message("Target is 32bit") message("Target is 32bit")