9000990c30
# Conflicts: # .travis.yml # Makefile.am # README.md # configure.ac # depends/Makefile # depends/builders/darwin.mk # depends/funcs.mk # depends/hosts/darwin.mk # depends/packages/googlemock.mk # depends/packages/googletest.mk # depends/packages/libsnark.mk # depends/packages/libsodium.mk # depends/packages/packages.mk # depends/packages/rust.mk # src/Makefile.am # src/Makefile.gtest.include # src/chainparams.cpp # src/chainparams.h # src/checkpoints.h # src/clientversion.h # src/coins.cpp # src/consensus/consensus.h # src/gtest/test_mempool.cpp # src/httprpc.cpp # src/init.cpp # src/komodo-tx.cpp # src/main.cpp # src/miner.cpp # src/policy/fees.cpp # src/policy/fees.h # src/rpcmining.cpp # src/rpcrawtransaction.cpp # src/rpcserver.cpp # src/test/policyestimator_tests.cpp # src/test/rpc_wallet_tests.cpp # src/test/transaction_tests.cpp # src/txdb.cpp # src/txmempool.cpp # src/wallet/asyncrpcoperation_sendmany.cpp # src/wallet/rpcwallet.cpp # src/wallet/wallet.cpp # src/wallet/wallet.h # src/zcash/CreateJoinSplit.cpp # zcutil/build.sh
20 lines
519 B
Makefile
20 lines
519 B
Makefile
rust_packages := rust librustzcash
|
|
<<<<<<< HEAD
|
|
zcash_packages := libsnark libgmp libsodium
|
|
|
|
ifeq ($(host_os),linux)
|
|
packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock
|
|
else
|
|
packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock libcurl
|
|
endif
|
|
|
|
|
|
=======
|
|
proton_packages := proton
|
|
zcash_packages := libgmp libsodium
|
|
packages := boost openssl libevent zeromq $(zcash_packages) googletest
|
|
>>>>>>> zcash/master
|
|
native_packages := native_ccache
|
|
|
|
wallet_packages=bdb
|