aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-11-14 22:24:16 -0800
committerWladimir J. van der Laan <laanwj@gmail.com>2012-11-14 22:24:16 -0800
commit6caffb5358b1e403b293846b3c832433fa928e46 (patch)
tree40587b50ab80b2f2a6d083b289ab24dfbce1aaee
parentf2b12807d04e981d0a252cbda6ba80c87a809d6e (diff)
parent90841fd5e05d99cce2d8ba8fba13e6ed005ffe26 (diff)
Merge pull request #1984 from grimd34th/patch-2
VariantClear@4 + shutdown@8 patch
-rw-r--r--bitcoin-qt.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 9f24b55186..e78318e28e 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -344,7 +344,6 @@ isEmpty(BOOST_INCLUDE_PATH) {
macx:BOOST_INCLUDE_PATH = /opt/local/include
}
-windows:LIBS += -lws2_32 -lshlwapi -lmswsock
windows:DEFINES += WIN32
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 += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
# -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
windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX