Merge remote-tracking branch 'upstream/devel'

This commit is contained in:
wowario 2019-11-07 11:09:42 +03:00
commit ccd4bc2fcc
35 changed files with 950 additions and 6532 deletions

View file

@ -31,7 +31,7 @@
set(LIBS common;blocks;cryptonote_basic;cryptonote_core;multisig;
cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device;
blockchain_db;ringct;wallet;cncrypto;easylogging;version;
checkpoints;randomx)
checkpoints;randomx;hardforks)
set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}")
@ -71,7 +71,9 @@ message(STATUS ${MONERO_SOURCE_DIR}/build)
# include monero headers
include_directories(
${MONERO_SOURCE_DIR}/src
${MONERO_SOURCE_DIR}/src/crypto
${MONERO_SOURCE_DIR}/external
${MONERO_SOURCE_DIR}/external/randomx/src
${MONERO_SOURCE_DIR}/build
${MONERO_SOURCE_DIR}/external/easylogging++
${MONERO_SOURCE_DIR}/contrib/epee/include