From: Matt Corallo <matt@bluematt.me>
Date: Sun, 4 Dec 2011 02:48:32 +0000 (-0500)
Subject: Move -lgdi32 after -lcrypto (fixes #681).
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~38^2~8
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=16e7c05de71a2c215e3b74522bf34d8e0da3381e;hp=4c519a47a9b8f6bb7067f5758d5198bf45ceb57d;p=novacoin.git

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

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 8fc177f..66b53c2 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) {