diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-05-27 13:34:22 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-05-27 13:34:22 -0500 |
| commit | f197f507bcab4c22613e1fee88195c2b5b52f7f8 (patch) | |
| tree | 23231d7d349f5125af3e86779aad1219e144b7bb | |
| parent | 4481aa7028f3cc48cf60c1227b158877696a35c9 (diff) | |
| parent | 07bda54c4101f90eb85cbcae73dab3cf5491e317 (diff) | |
| download | monzero-gui-f197f507bcab4c22613e1fee88195c2b5b52f7f8.tar.gz monzero-gui-f197f507bcab4c22613e1fee88195c2b5b52f7f8.tar.xz monzero-gui-f197f507bcab4c22613e1fee88195c2b5b52f7f8.zip | |
Merge pull request #2173
fbd6d68 build: Windows statically link gcc and c++ runtime (xiphon)
07bda54 build: Windows link against setupapi (hidapi dependency) (xipon)
| -rw-r--r-- | monero-wallet-gui.pro | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index dacf11b7..3d4f7b9e 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -255,7 +255,17 @@ win32 { LIBS+=-L$$BOOST_PATH/lib LIBS+=-L$$BOOST_MINGW_PATH/lib + QMAKE_LFLAGS += -static-libgcc -static-libstdc++ + LIBS+= \ + -Wl,-Bdynamic \ + -lwinscard \ + -lws2_32 \ + -lwsock32 \ + -lIphlpapi \ + -lcrypt32 \ + -lhidapi \ + -lgdi32 $$TREZOR_LINKER \ -Wl,-Bstatic \ -lboost_serialization-mt \ -lboost_thread-mt \ @@ -272,17 +282,11 @@ win32 { -licudt \ -licutu \ -liconv \ + -lpthread \ + -lsetupapi \ -lssl \ -lsodium \ - -lcrypto \ - -Wl,-Bdynamic \ - -lwinscard \ - -lws2_32 \ - -lwsock32 \ - -lIphlpapi \ - -lcrypt32 \ - -lhidapi \ - -lgdi32 $$TREZOR_LINKER + -lcrypto !contains(QMAKE_TARGET.arch, x86_64) { message("Target is 32bit") |