mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
Merge pull request #1984 from grimd34th/patch-2
VariantClear@4 + shutdown@8 patch
This commit is contained in:
commit
6caffb5358
@ -344,7 +344,6 @@ isEmpty(BOOST_INCLUDE_PATH) {
|
|||||||
macx:BOOST_INCLUDE_PATH = /opt/local/include
|
macx:BOOST_INCLUDE_PATH = /opt/local/include
|
||||||
}
|
}
|
||||||
|
|
||||||
windows:LIBS += -lws2_32 -lshlwapi -lmswsock
|
|
||||||
windows:DEFINES += WIN32
|
windows:DEFINES += WIN32
|
||||||
windows:RC_FILE = src/qt/res/bitcoin-qt.rc
|
windows:RC_FILE = src/qt/res/bitcoin-qt.rc
|
||||||
|
|
||||||
@ -379,7 +378,7 @@ INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$
|
|||||||
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
|
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
|
||||||
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
|
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
|
||||||
# -lgdi32 has to happen after -lcrypto (see #681)
|
# -lgdi32 has to happen after -lcrypto (see #681)
|
||||||
windows:LIBS += -lole32 -luuid -lgdi32
|
windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
|
||||||
LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
|
LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
|
||||||
windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
|
windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user