diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-05 07:53:00 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-05 07:53:00 -0800 |
| commit | f66eabd281252b700dbe980fbd19138d864683da (patch) | |
| tree | 4fa98fde441d44cba2858a8ace7aaf75ac4cffb7 | |
| parent | 43ae68b5efb2d7f8c23f64d3efdbd49c9d90aff2 (diff) | |
| parent | 3f9144d42c7a05a9acb3334c0fcea4585f8780f2 (diff) | |
Merge pull request #682 from TheBlueMatt/gdicrypto
Move -lgdi32 after -lcrypto (fixes #681)
| -rw-r--r-- | bitcoin-qt.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 8fc177f7f4..66b53c2367 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -251,7 +251,7 @@ isEmpty(BOOST_INCLUDE_PATH) { macx:BOOST_INCLUDE_PATH = /opt/local/include } -windows:LIBS += -lws2_32 -lgdi32 +windows:LIBS += -lws2_32 windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc @@ -266,6 +266,8 @@ macx:TARGET = "Bitcoin-Qt" 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,) LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX +# -lgdi32 has to happen after -lcrypto (see #681) +windows:LIBS += -lgdi32 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX contains(RELEASE, 1) { |