diff options
| -rw-r--r-- | build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj | 12 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 13 |
3 files changed, 18 insertions, 13 deletions
diff --git a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj index affb60425b..2ac0be9814 100644 --- a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj +++ b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj @@ -18,27 +18,18 @@ <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> <Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project> </ProjectReference> - <ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj"> - <Project>{0667528c-d734-4009-adf9-c0d6c4a5a5a6}</Project> - </ProjectReference> <ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj"> <Project>{7c87e378-df58-482e-aa2f-1bc129bc19ce}</Project> </ProjectReference> <ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj"> <Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project> </ProjectReference> - <ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj"> - <Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project> - </ProjectReference> <ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj"> <Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project> </ProjectReference> <ProjectReference Include="..\libbitcoin_wallet\libbitcoin_wallet.vcxproj"> <Project>{93b86837-b543-48a5-a89b-7c87abb77df2}</Project> </ProjectReference> - <ProjectReference Include="..\libbitcoin_zmq\libbitcoin_zmq.vcxproj"> - <Project>{792d487f-f14c-49fc-a9de-3fc150f31c3f}</Project> - </ProjectReference> <ProjectReference Include="..\libunivalue\libunivalue.vcxproj"> <Project>{5724ba7d-a09a-4ba8-800b-c4c1561b3d69}</Project> </ProjectReference> @@ -48,9 +39,6 @@ <ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj"> <Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project> </ProjectReference> - <ProjectReference Include="..\libleveldb\libleveldb.vcxproj"> - <Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project> - </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/configure.ac b/configure.ac index 6d721ad0a6..2c6e762d6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1352,6 +1352,12 @@ if test x$use_ebpf != xno; then ) fi +if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests = xnonononononono; then + use_upnp=no + use_natpmp=no + use_zmq=no +fi + dnl Check for libminiupnpc (optional) if test x$use_upnp != xno; then AC_CHECK_HEADERS( diff --git a/src/Makefile.am b/src/Makefile.am index 85450149cf..6cfd5a9050 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -709,7 +709,18 @@ bitcoin_wallet_SOURCES += init/bitcoin-wallet.cpp bitcoin_wallet_CPPFLAGS = $(bitcoin_bin_cppflags) bitcoin_wallet_CXXFLAGS = $(bitcoin_bin_cxxflags) bitcoin_wallet_LDFLAGS = $(bitcoin_bin_ldflags) -bitcoin_wallet_LDADD = $(LIBBITCOIN_WALLET_TOOL) $(bitcoin_bin_ldadd) +bitcoin_wallet_LDADD = \ + $(LIBBITCOIN_WALLET_TOOL) \ + $(LIBBITCOIN_WALLET) \ + $(LIBBITCOIN_COMMON) \ + $(LIBBITCOIN_UTIL) \ + $(LIBUNIVALUE) \ + $(LIBBITCOIN_CONSENSUS) \ + $(LIBBITCOIN_CRYPTO) \ + $(LIBSECP256K1) \ + $(BOOST_LIBS) \ + $(BDB_LIBS) \ + $(SQLITE_LIBS) if TARGET_WINDOWS bitcoin_wallet_SOURCES += bitcoin-wallet-res.rc |