aboutsummaryrefslogtreecommitdiff
path: root/bitcoin-qt.pro
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-04-04 11:10:43 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2013-04-04 11:10:43 -0700
commit8da48cb5618892c3c534bcff6c90857ff99e1ca2 (patch)
tree93f3735ed181357972f40b297b2282f280542c06 /bitcoin-qt.pro
parent9bbd144ec1f514ba83814296ac9cce278d31c2fc (diff)
parent0add26da4dea51eed3993b3f4c311d8a1c52c479 (diff)
downloadbitcoin-8da48cb5618892c3c534bcff6c90857ff99e1ca2.tar.xz
Merge pull request #2454 from TheBlueMatt/master
Fix leveldb make flags in bitcoin-qt.pro
Diffstat (limited to 'bitcoin-qt.pro')
-rw-r--r--bitcoin-qt.pro5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 64468d324b..ac0904a734 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -101,14 +101,15 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
INCLUDEPATH += src/leveldb/include src/leveldb/helpers
LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
!win32 {
- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a
+ # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
} else {
# make an educated guess about what the ranlib command is called
isEmpty(QMAKE_RANLIB) {
QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
}
LIBS += -lshlwapi
- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
}
genleveldb.target = $$PWD/src/leveldb/libleveldb.a
genleveldb.depends = FORCE