git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
d05c03a
76a3bfa
)
Merge branch '0.5.0.x' into 0.5.3.x
author
Luke Dashjr
<luke-jr+git@utopios.org>
Fri, 16 Mar 2012 21:28:22 +0000 (17:28 -0400)
committer
Luke Dashjr
<luke-jr+git@utopios.org>
Fri, 16 Mar 2012 21:28:36 +0000 (17:28 -0400)
1
2
bitcoin-qt.pro
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
bitcoin-qt.pro
index
34ce109
,
7fcb507
..
121a53f
---
1
/
bitcoin-qt.pro
---
2
/
bitcoin-qt.pro
+++ b/
bitcoin-qt.pro
@@@
-1,6
-1,6
+1,6
@@@
TEMPLATE = app
TARGET =
-VERSION = 0.5.0.4
+VERSION = 0.5.3
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB
CONFIG += no_include_pwd
@@@
-251,8
-251,8
+251,8
@@@
isEmpty(BOOST_INCLUDE_PATH)
macx:BOOST_INCLUDE_PATH = /opt/local/include
}
- windows:LIBS += -lws2_32
- windows:DEFINES += WIN32
+ windows:LIBS += -lmingwthrd -lws2_32
+ windows:DEFINES += _MT WIN32
windows:RC_FILE = src/qt/res/bitcoin-qt.rc
macx:HEADERS += src/qt/macdockiconhandler.h