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:
parent
4c59750ed2
commit
09653279d1
|
@ -76,13 +76,17 @@ if(APPLE)
|
||||||
link_directories(/usr/local/lib)
|
link_directories(/usr/local/lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
find_library (UNBOUND_LIBRARY unbound)
|
||||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32)
|
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR (${UNBOUND_LIBRARY} STREQUAL "UNBOUND_LIBRARY-NOTFOUND"))
|
||||||
add_library(unbound STATIC IMPORTED)
|
add_library(unbound STATIC IMPORTED)
|
||||||
set_property(TARGET unbound PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/unbound/libunbound.a)
|
set_property(TARGET unbound PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/external/unbound/libunbound.a)
|
||||||
endif()
|
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 boost headers
|
||||||
include_directories(${Boost_INCLUDE_DIRS})
|
include_directories(${Boost_INCLUDE_DIRS})
|
||||||
|
@ -125,6 +129,7 @@ set(LIBRARIES
|
||||||
wallet
|
wallet
|
||||||
blockchain_db
|
blockchain_db
|
||||||
device
|
device
|
||||||
|
${WALLET_CRYPTO}
|
||||||
cryptonote_core
|
cryptonote_core
|
||||||
cryptonote_protocol
|
cryptonote_protocol
|
||||||
cryptonote_basic
|
cryptonote_basic
|
||||||
|
@ -158,8 +163,16 @@ else()
|
||||||
set(LIBRARIES ${LIBRARIES} atomic)
|
set(LIBRARIES ${LIBRARIES} atomic)
|
||||||
endif()
|
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)
|
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32)
|
||||||
set(LIBRARIES ${LIBRARIES} unwind)
|
set(LIBRARIES ${LIBRARIES} ${UNWIND_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
set(LIBS common;blocks;cryptonote_basic;cryptonote_core;multisig;
|
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;
|
blockchain_db;ringct;wallet;cncrypto;easylogging;version;
|
||||||
checkpoints;randomx;hardforks;miniupnpc)
|
checkpoints;randomx;hardforks;miniupnpc)
|
||||||
|
|
||||||
|
@ -45,7 +45,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}" "/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
|
NO_DEFAULT_PATH
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -53,8 +53,10 @@ foreach (l ${LIBS})
|
||||||
|
|
||||||
message(STATUS FindMonero " Xmr_${L}_LIBRARIES ${Xmr_${L}_LIBRARY}")
|
message(STATUS FindMonero " Xmr_${L}_LIBRARIES ${Xmr_${L}_LIBRARY}")
|
||||||
|
|
||||||
|
if(NOT "${Xmr_${L}_LIBRARIES}" STREQUAL "${Xmr_${L}_LIBRARY-NOTFOUND}")
|
||||||
add_library(${l} STATIC IMPORTED)
|
add_library(${l} STATIC IMPORTED)
|
||||||
set_property(TARGET ${l} PROPERTY IMPORTED_LOCATION ${Xmr_${L}_LIBRARIES})
|
set_property(TARGET ${l} PROPERTY IMPORTED_LOCATION ${Xmr_${L}_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
@ -72,6 +74,7 @@ message(STATUS ${MONERO_SOURCE_DIR}/build)
|
||||||
include_directories(
|
include_directories(
|
||||||
${MONERO_SOURCE_DIR}/src
|
${MONERO_SOURCE_DIR}/src
|
||||||
${MONERO_SOURCE_DIR}/src/crypto
|
${MONERO_SOURCE_DIR}/src/crypto
|
||||||
|
${MONERO_SOURCE_DIR}/src/crypto/wallet
|
||||||
${MONERO_SOURCE_DIR}/external
|
${MONERO_SOURCE_DIR}/external
|
||||||
${MONERO_SOURCE_DIR}/external/randomx/src
|
${MONERO_SOURCE_DIR}/external/randomx/src
|
||||||
${MONERO_SOURCE_DIR}/build
|
${MONERO_SOURCE_DIR}/build
|
||||||
|
|
Loading…
Reference in New Issue