compatibility with realease_v013

denniselite · May 21, 2019 · 9607cc2 · 9607cc2
1 parent 6cd783c
commit 9607cc2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "src/xmregcore"]
 	path = src/xmregcore
 	url = https://github.com/moneroexamples/xmregcore
-    branch = master
+    branch = release_v13
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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)
-
 
diff --git a/src/CurrentBlockchainStatus.cpp b/src/CurrentBlockchainStatus.cpp
@@ -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(

diff --git a/src/CurrentBlockchainStatus.h b/src/CurrentBlockchainStatus.h
@@ -378,7 +378,10 @@ class MicroCoreAdapter : public AbstractCore
     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(

diff --git a/src/xmregcore b/src/xmregcore
+12 −12		cmake/FindMonero.cmake
+5 −5		src/MicroCore.cpp
+5 −5		src/MicroCore.h
+2 −2		src/UniversalIdentifier.hpp