Skip to content

Commit ae85c8d

Browse files
author
MarcoFalke
committed
Merge #14568: build: Fix Qt link order for Windows build
fbaccbf build: Fix Qt link order for Windows build (Chun Kuan Lee) Pull request description: See bitcoin/bitcoin#14451 (comment) Tree-SHA512: 819e68dc750297a74d04aa1ad3dae64072b66df718d36b950bd9430c9fca1771c611af934df23954f81b83bd89f96ea76c20cbf17db1364b988a6c34c43fb631
2 parents d50c996 + fbaccbf commit ae85c8d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/Makefile.qt.include

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,13 @@ endif
416416
if ENABLE_ZMQ
417417
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
418418
endif
419+
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
420+
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
421+
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
419422
if ENABLE_BIP70
420423
qt_bitcoin_qt_LDADD += $(SSL_LIBS)
421424
endif
422-
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
423-
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
424-
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
425+
qt_bitcoin_qt_LDADD += $(CRYPTO_LIBS)
425426
qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
426427
qt_bitcoin_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX
427428

0 commit comments

Comments
 (0)