mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

Allow src!=build dir building

Browse source
This commit is contained in:
Tom Zander 2016-02-15 10:55:04 +00:00
parent a8a6d7de39
commit c9d71db1e5
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -7,8 +7,8 @@ AM_CPPFLAGS = $(HARDENED_CPPFLAGS)
if EMBEDDED_LEVELDB
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
LIBLEVELDB += $(builddir)/leveldb/libleveldb.a
LIBMEMENV += $(builddir)/leveldb/libmemenv.a
LIBLEVELDB += $(top_srcdir)/src/leveldb/libleveldb.a
LIBMEMENV += $(top_srcdir)/src/leveldb/libmemenv.a
# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
$(LIBLEVELDB): $(LIBMEMENV)

4
src/Makefile.qt.include
View file

@ -156,6 +156,10 @@ QT_MOC = \
qt/overviewpage.moc \
qt/rpcconsole.moc
if ENABLE_WALLET
MOC_DEFS += -DENABLE_WALLET=1
endif
QT_QRC_CPP = qt/qrc_bitcoin.cpp
QT_QRC = qt/bitcoin.qrc
QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp