compatibility with realease_v013

master
moneroexamples 5 years ago
parent 6cd783c9d6
commit 9607cc2c69

2
.gitmodules vendored

@ -1,4 +1,4 @@
[submodule "src/xmregcore"]
path = src/xmregcore
url = https://github.com/moneroexamples/xmregcore
branch = master
branch = release_v13

@ -60,19 +60,6 @@ if (NOT MYSQL_INCLUDE_DIR)
return()
endif()
macro(target_include_monero_directories target_name)
target_include_directories(${target_name}
PRIVATE
${MONERO_SOURCE_DIR}/src
${MONERO_SOURCE_DIR}/external
${MONERO_SOURCE_DIR}/build
${MONERO_SOURCE_DIR}/external/easylogging++
${MONERO_SOURCE_DIR}/contrib/epee/include
${MONERO_SOURCE_DIR}/external/db_drivers/liblmdb)
endmacro(target_include_monero_directories)
include_directories(${MYSQL_INCLUDE_DIR})
@ -142,7 +129,7 @@ target_include_monero_directories(${PROJECT_NAME})
set(LIBRARIES
myxrm
myxrmcore
${Monero_LIBRARIES}
Monero::Monero
restbed
mysqlpp
mysqlclient

@ -30,8 +30,4 @@ add_library(myxrm
target_include_monero_directories(myxrm)
target_include_directories(myxrm PRIVATE "xmregcore")
#target_include_directories(myxmr
# PUBLIC
#${MONERO_SOURCE_DIR}/contrib/epee/include)

@ -1307,6 +1307,12 @@ MicroCoreAdapter::get_output_key(uint64_t amount,
{
cbs->get_output_keys(amount, absolute_offsets, outputs);
}
uint64_t
MicroCoreAdapter::get_num_outputs(uint64_t amount)
{
return 0;
}
void
MicroCoreAdapter::get_output_tx_and_index(

@ -378,7 +378,10 @@ public:
get_output_key(uint64_t amount,
vector<uint64_t> const& absolute_offsets,
vector<cryptonote::output_data_t>& outputs)
/*const*/ override;
override;
virtual uint64_t
get_num_outputs(uint64_t amount) override;
virtual void
get_output_tx_and_index(

@ -1 +1 @@
Subproject commit efeff91fcfe767f5f0891879b7364e565ca52e69
Subproject commit 5714f7221b1a66a01b7e868a46a00c5eb8ef0409
Loading…
Cancel
Save