diff options
| author | grimd34th <ubpd34th@gmail.com> | 2012-11-04 21:00:57 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-16 20:48:27 +0000 |
| commit | 0b37038d2ba67b2f57511f5ebd459f2da1b78a6a (patch) | |
| tree | 2239eaa39731b826c5fb26722b023993172d7c3e | |
| parent | 2a333587bdd4d77a96cbcf1166310af4aee7efeb (diff) | |
| download | bitcoin-0b37038d2ba67b2f57511f5ebd459f2da1b78a6a.tar.xz | |
VariantClear@4 + shutdown@8 patch
merged 2 windows:LIBS lines so they happen when they need to (#976)
added -loleaut32 to fix VariantClear
moved -lws2_32 and others to existing windows:LIBS line
| -rw-r--r-- | bitcoin-qt.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index befb3e90e9..0cba302275 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -322,7 +322,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 @@ -357,7 +356,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 |