compile with current dev version of monero

This commit is contained in:
moneroexamples 2017-10-02 11:31:04 +08:00
parent 19d6e4f9be
commit fab2a28db0
4 changed files with 13 additions and 11 deletions

View file

@ -101,6 +101,7 @@ set(LIBRARIES
cryptonote_basic
daemonizer
cncrypto
blocks
lmdb
ringct
@ -108,6 +109,8 @@ set(LIBRARIES
mnemonics
epee
easylogging
checkpoints
version
${Boost_LIBRARIES}
pthread
unbound

View file

@ -30,7 +30,7 @@
set(LIBS common;blocks;cryptonote_basic;cryptonote_core;
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}")
@ -44,7 +44,7 @@ foreach (l ${LIBS})
find_library(Xmr_${L}_LIBRARY
NAMES ${l}
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
)
@ -57,11 +57,11 @@ foreach (l ${LIBS})
endforeach()
if (EXISTS ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
add_library(easylogging STATIC IMPORTED)
set_property(TARGET easylogging
PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
endif()
#if (EXISTS ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
# add_library(easylogging STATIC IMPORTED)
# set_property(TARGET easylogging
# PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/easylogging++/libeasylogging.a)
#endif()
message(STATUS ${MONERO_SOURCE_DIR}/build)

View file

@ -16,12 +16,11 @@
#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 "storages/http_abstract_invoke.h"
//#include "cryptonote_core/cryptonote_basic.h"
#include "cryptonote_core/tx_pool.h"
#include "cryptonote_core/blockchain.h"
#include "blockchain_db/lmdb/db_lmdb.h"

View file

@ -9,10 +9,10 @@
#include "mstch/mstch.hpp"
#include "version.h"
#include "monero_headers.h"
#include "../gen/version.h"
#include "MicroCore.h"
#include "tools.h"
#include "rpccalls.h"