aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2012-08-28 23:30:46 -0700
committerWladimir J. van der Laan <[email protected]>2012-08-28 23:30:46 -0700
commit29316f7bd0cd1ee3c677cf8d446629c5d412b39d (patch)
treebf59212ac72a1e4feaf4e20d03d05c608216c5ac
parentMerge pull request #1748 from sipa/bugfix_portinc (diff)
parentRemove json/*.cpp from Qt build system (diff)
downloaddiscoin-29316f7bd0cd1ee3c677cf8d446629c5d412b39d.tar.xz
discoin-29316f7bd0cd1ee3c677cf8d446629c5d412b39d.zip
Merge pull request #1751 from laanwj/2012_08_qtjsonspirit
Remove json/*.cpp from Qt build system
-rw-r--r--bitcoin-qt.pro5
1 files changed, 1 insertions, 4 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index c8f46538b..76c6fdba1 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -92,7 +92,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
# for extra security against potential buffer overflows
QMAKE_CXXFLAGS += -fstack-protector
QMAKE_LFLAGS += -fstack-protector
- # do not enable this on windows, as it will result in a non-working executable!
+ # do not enable this on windows cross compile with mingw 4.2.x, as it will result in a non-working executable!
}
# regenerate src/build.h
@@ -202,9 +202,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/addrman.cpp \
src/db.cpp \
src/walletdb.cpp \
- src/json/json_spirit_writer.cpp \
- src/json/json_spirit_value.cpp \
- src/json/json_spirit_reader.cpp \
src/qt/clientmodel.cpp \
src/qt/guiutil.cpp \
src/qt/transactionrecord.cpp \