d0s3t3ch
/
onion-wownero-blockchain-explorer
mirror of https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: monero_crypto_amd64_64_24k_generate_subaddress_public_key 

https://github.com/moneroexamples/onion-monero-blockchain-explorer/issues/215#issuecomment-680397635
This commit is contained in:
moneroexamples 2020-08-29 13:12:18 +08:00
parent 4c59750ed2
commit 09653279d1
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -76,13 +76,17 @@ if(APPLE)
link_directories(/usr/local/lib)
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32)
find_library (UNBOUND_LIBRARY unbound)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR (${UNBOUND_LIBRARY} STREQUAL "UNBOUND_LIBRARY-NOTFOUND"))
add_library(unbound STATIC IMPORTED)
set_property(TARGET unbound PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/unbound/libunbound.a)
endif()
if("${Xmr_WALLET-CRYPTO_LIBRARIES}" STREQUAL "Xmr_WALLET-CRYPTO_LIBRARY-NOTFOUND")
set(WALLET_CRYPTO "")
else()
set(WALLET_CRYPTO ${Xmr_WALLET-CRYPTO_LIBRARIES})
endif()
# include boost headers
include_directories(${Boost_INCLUDE_DIRS})
@ -125,6 +129,7 @@ set(LIBRARIES
wallet
blockchain_db
device
${WALLET_CRYPTO}
cryptonote_core
cryptonote_protocol
cryptonote_basic
@ -158,8 +163,16 @@ else()
set(LIBRARIES ${LIBRARIES} atomic)
endif()
find_library(UNWIND_LIBRARY unwind)
if (${UNWIND_LIBRARY} STREQUAL "UNWIND_LIBRARY-NOTFOUND")
message (STATUS "unwind library not found")
set (UNWIND_LIBRARY "")
else ()
message (STATUS "Found unwind library: ${UNWIND_LIBRARY}")
endif ()
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32)
set(LIBRARIES ${LIBRARIES} unwind)
set(LIBRARIES ${LIBRARIES} ${UNWIND_LIBRARY})
endif()
if (WIN32)

11
cmake/FindMonero.cmake
View File

@ -29,7 +29,7 @@
#------------------------------------------------------------------------------
set(LIBS common;blocks;cryptonote_basic;cryptonote_core;multisig;
cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device;
cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device;wallet-crypto;
blockchain_db;ringct;wallet;cncrypto;easylogging;version;
checkpoints;randomx;hardforks;miniupnpc)
@ -45,7 +45,7 @@ foreach (l ${LIBS})
find_library(Xmr_${L}_LIBRARY
NAMES ${l}
PATHS ${CMAKE_LIBRARY_PATH}
PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/contrib/epee/src" "/external/easylogging++/" "/external/${l}" "external/miniupnp/miniupnpc"
PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/src/crypto/wallet" "/contrib/epee/src" "/external/easylogging++/" "/external/${l}" "external/miniupnp/miniupnpc"
NO_DEFAULT_PATH
)
@ -53,8 +53,10 @@ foreach (l ${LIBS})
message(STATUS FindMonero " Xmr_${L}_LIBRARIES ${Xmr_${L}_LIBRARY}")
add_library(${l} STATIC IMPORTED)
set_property(TARGET ${l} PROPERTY IMPORTED_LOCATION ${Xmr_${L}_LIBRARIES})
if(NOT "${Xmr_${L}_LIBRARIES}" STREQUAL "${Xmr_${L}_LIBRARY-NOTFOUND}")
add_library(${l} STATIC IMPORTED)
set_property(TARGET ${l} PROPERTY IMPORTED_LOCATION ${Xmr_${L}_LIBRARIES})
endif()
endforeach()
@ -72,6 +74,7 @@ message(STATUS ${MONERO_SOURCE_DIR}/build)
include_directories(
${MONERO_SOURCE_DIR}/src
${MONERO_SOURCE_DIR}/src/crypto
${MONERO_SOURCE_DIR}/src/crypto/wallet
${MONERO_SOURCE_DIR}/external
${MONERO_SOURCE_DIR}/external/randomx/src
${MONERO_SOURCE_DIR}/build