compile with current dev version of monero
This commit is contained in:
parent
19d6e4f9be
commit
fab2a28db0
|
@ -101,6 +101,7 @@ set(LIBRARIES
|
||||||
cryptonote_basic
|
cryptonote_basic
|
||||||
daemonizer
|
daemonizer
|
||||||
cncrypto
|
cncrypto
|
||||||
|
|
||||||
blocks
|
blocks
|
||||||
lmdb
|
lmdb
|
||||||
ringct
|
ringct
|
||||||
|
@ -108,6 +109,8 @@ set(LIBRARIES
|
||||||
mnemonics
|
mnemonics
|
||||||
epee
|
epee
|
||||||
easylogging
|
easylogging
|
||||||
|
checkpoints
|
||||||
|
version
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
pthread
|
pthread
|
||||||
unbound
|
unbound
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
set(LIBS common;blocks;cryptonote_basic;cryptonote_core;
|
set(LIBS common;blocks;cryptonote_basic;cryptonote_core;
|
||||||
cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;
|
cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;
|
||||||
blockchain_db;ringct;wallet;cncrypto)
|
blockchain_db;ringct;wallet;cncrypto;easylogging;version;checkpoints)
|
||||||
|
|
||||||
set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}")
|
set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}")
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ foreach (l ${LIBS})
|
||||||
find_library(Xmr_${L}_LIBRARY
|
find_library(Xmr_${L}_LIBRARY
|
||||||
NAMES ${l}
|
NAMES ${l}
|
||||||
PATHS ${CMAKE_LIBRARY_PATH}
|
PATHS ${CMAKE_LIBRARY_PATH}
|
||||||
PATH_SUFFIXES "/src/${l}" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/contrib/epee/src"
|
PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/contrib/epee/src" "/external/easylogging++/"
|
||||||
NO_DEFAULT_PATH
|
NO_DEFAULT_PATH
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -57,11 +57,11 @@ foreach (l ${LIBS})
|
||||||
|
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if (EXISTS ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
|
#if (EXISTS ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
|
||||||
add_library(easylogging STATIC IMPORTED)
|
# add_library(easylogging STATIC IMPORTED)
|
||||||
set_property(TARGET easylogging
|
# set_property(TARGET easylogging
|
||||||
PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
|
# PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
|
||||||
endif()
|
#endif()
|
||||||
|
|
||||||
message(STATUS ${MONERO_SOURCE_DIR}/build)
|
message(STATUS ${MONERO_SOURCE_DIR}/build)
|
||||||
|
|
||||||
|
|
|
@ -16,12 +16,11 @@
|
||||||
|
|
||||||
#define FEE_ESTIMATE_GRACE_BLOCKS 10 // estimate fee valid for that many blocks
|
#define FEE_ESTIMATE_GRACE_BLOCKS 10 // estimate fee valid for that many blocks
|
||||||
|
|
||||||
#include "release/version/version.h"
|
#include "version.h"
|
||||||
|
|
||||||
#include "net/http_client.h"
|
#include "net/http_client.h"
|
||||||
#include "storages/http_abstract_invoke.h"
|
#include "storages/http_abstract_invoke.h"
|
||||||
|
|
||||||
//#include "cryptonote_core/cryptonote_basic.h"
|
|
||||||
#include "cryptonote_core/tx_pool.h"
|
#include "cryptonote_core/tx_pool.h"
|
||||||
#include "cryptonote_core/blockchain.h"
|
#include "cryptonote_core/blockchain.h"
|
||||||
#include "blockchain_db/lmdb/db_lmdb.h"
|
#include "blockchain_db/lmdb/db_lmdb.h"
|
||||||
|
|
|
@ -9,10 +9,10 @@
|
||||||
|
|
||||||
#include "mstch/mstch.hpp"
|
#include "mstch/mstch.hpp"
|
||||||
|
|
||||||
#include "version.h"
|
|
||||||
|
|
||||||
#include "monero_headers.h"
|
#include "monero_headers.h"
|
||||||
|
|
||||||
|
#include "../gen/version.h"
|
||||||
|
|
||||||
#include "MicroCore.h"
|
#include "MicroCore.h"
|
||||||
#include "tools.h"
|
#include "tools.h"
|
||||||
#include "rpccalls.h"
|
#include "rpccalls.h"
|
||||||
|
|
Loading…
Reference in New Issue