mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 12:09:57 +00:00
Fix windows mingw build
This commit is contained in:
parent
a5a90c7ed8
commit
f61656a1b8
1 changed files with 6 additions and 5 deletions
|
@ -13,15 +13,16 @@ CONFIG += c++11 link_pkgconfig
|
||||||
packagesExist(libusb-1.0) {
|
packagesExist(libusb-1.0) {
|
||||||
PKGCONFIG += libusb-1.0
|
PKGCONFIG += libusb-1.0
|
||||||
}
|
}
|
||||||
packagesExist(protobuf) {
|
|
||||||
PKGCONFIG += protobuf
|
|
||||||
}
|
|
||||||
packagesExist(hidapi-libusb) {
|
packagesExist(hidapi-libusb) {
|
||||||
PKGCONFIG += hidapi-libusb
|
PKGCONFIG += hidapi-libusb
|
||||||
}
|
}
|
||||||
!win32 {
|
!win32 {
|
||||||
QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong
|
QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong
|
||||||
QMAKE_LFLAGS += -fstack-protector -fstack-protector-strong
|
QMAKE_LFLAGS += -fstack-protector -fstack-protector-strong
|
||||||
|
|
||||||
|
packagesExist(protobuf) {
|
||||||
|
PKGCONFIG += protobuf
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# cleaning "auto-generated" bitmonero directory on "make distclean"
|
# cleaning "auto-generated" bitmonero directory on "make distclean"
|
||||||
|
@ -260,7 +261,6 @@ win32 {
|
||||||
LIBS+= \
|
LIBS+= \
|
||||||
-Wl,-Bdynamic \
|
-Wl,-Bdynamic \
|
||||||
-lwinscard \
|
-lwinscard \
|
||||||
-lws2_32 \
|
|
||||||
-lwsock32 \
|
-lwsock32 \
|
||||||
-lIphlpapi \
|
-lIphlpapi \
|
||||||
-lcrypt32 \
|
-lcrypt32 \
|
||||||
|
@ -286,7 +286,8 @@ win32 {
|
||||||
-lsetupapi \
|
-lsetupapi \
|
||||||
-lssl \
|
-lssl \
|
||||||
-lsodium \
|
-lsodium \
|
||||||
-lcrypto
|
-lcrypto \
|
||||||
|
-lws2_32
|
||||||
|
|
||||||
!contains(QMAKE_TARGET.arch, x86_64) {
|
!contains(QMAKE_TARGET.arch, x86_64) {
|
||||||
message("Target is 32bit")
|
message("Target is 32bit")
|
||||||
|
|
Loading…
Reference in a new issue