Browse files

Move -lgdi32 after -lcrypto (fixes #681).

  • Loading branch information...
1 parent 43ae68b commit 3f9144d42c7a05a9acb3334c0fcea4585f8780f2 @TheBlueMatt committed Dec 3, 2011
Showing with 3 additions and 1 deletion.
  1. +3 −1 bitcoin-qt.pro
View
4 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) {

0 comments on commit 3f9144d

Please sign in to comment.