diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-02 09:18:20 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-02 09:23:05 +0200 |
commit | c9600ce640d02614a47ed53df7f975900ee69b22 (patch) | |
tree | 4f5a5241113025ac7ad0bbea35a39041399fa729 /src/Makefile.qt.include | |
parent | e442c82faaa09cbf9510b8baf14622da2d54ae5f (diff) | |
parent | fda3fed18aedc4bfc8ccffe89d8d2cabb12677ab (diff) | |
download | bitcoin-c9600ce640d02614a47ed53df7f975900ee69b22.tar.xz |
Merge pull request #4312
fda3fed libsecp256k1 integration (Pieter Wuille)
5566826 secp256k1: Add build-side changes for libsecp256k1 (Cory Fields)
b150b09 secp256k1: add libtool as a dependency (Cory Fields)
Diffstat (limited to 'src/Makefile.qt.include')
-rw-r--r-- | src/Makefile.qt.include | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 9df0779ba3..4563bb3565 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -357,6 +357,9 @@ qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) endif qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) +if USE_LIBSECP256K1 + qt_bitcoin_qt_LDADD += secp256k1/libsecp256k1.la +endif qt_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS) #locale/foo.ts -> locale/foo.qm |