From f61656a1b85dc445efc2b73665c21e7de3281f44 Mon Sep 17 00:00:00 2001 From: mmbyday Date: Fri, 31 May 2019 21:50:56 -0700 Subject: [PATCH] Fix windows mingw build --- monero-wallet-gui.pro | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 3d4f7b9e..ca45e4ea 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -13,15 +13,16 @@ CONFIG += c++11 link_pkgconfig packagesExist(libusb-1.0) { PKGCONFIG += libusb-1.0 } -packagesExist(protobuf) { - PKGCONFIG += protobuf -} packagesExist(hidapi-libusb) { PKGCONFIG += hidapi-libusb } !win32 { QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong QMAKE_LFLAGS += -fstack-protector -fstack-protector-strong + + packagesExist(protobuf) { + PKGCONFIG += protobuf + } } # cleaning "auto-generated" bitmonero directory on "make distclean" @@ -260,7 +261,6 @@ win32 { LIBS+= \ -Wl,-Bdynamic \ -lwinscard \ - -lws2_32 \ -lwsock32 \ -lIphlpapi \ -lcrypt32 \ @@ -286,7 +286,8 @@ win32 { -lsetupapi \ -lssl \ -lsodium \ - -lcrypto + -lcrypto \ + -lws2_32 !contains(QMAKE_TARGET.arch, x86_64) { message("Target is 32bit")