git://git.novaco.in
/
novacoin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
Merge branch '0.5.0.x' into 0.5.x
[novacoin.git]
/
bitcoin-qt.pro
diff --git
a/bitcoin-qt.pro
b/bitcoin-qt.pro
index
bb76825
..
d46a6e7
100644
(file)
--- a/
bitcoin-qt.pro
+++ b/
bitcoin-qt.pro
@@
-254,6
+254,7
@@
isEmpty(BOOST_INCLUDE_PATH) {
windows:LIBS += -lmingwthrd -lws2_32
windows:DEFINES += _MT WIN32
windows:RC_FILE = src/qt/res/bitcoin-qt.rc
+windows:QMAKE_LIBS_QT_ENTRY -= -lmingw32
macx:HEADERS += src/qt/macdockiconhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm