mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
cmake: fix undefined symbols and multiple definitions
This commit is contained in:
parent
14be80f992
commit
fe76d7dee7
@ -572,6 +572,10 @@ if(STATIC AND NOT IOS)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
list(APPEND OPENSSL_LIBRARIES ws2_32 crypt32)
|
||||||
|
endif()
|
||||||
|
|
||||||
find_package(HIDAPI)
|
find_package(HIDAPI)
|
||||||
|
|
||||||
add_definition_if_library_exists(c memset_s "string.h" HAVE_MEMSET_S)
|
add_definition_if_library_exists(c memset_s "string.h" HAVE_MEMSET_S)
|
||||||
|
@ -36,6 +36,14 @@ if(APPLE)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
monero_add_library(cryptonote_format_utils_basic
|
||||||
|
cryptonote_format_utils_basic.cpp
|
||||||
|
)
|
||||||
|
target_link_libraries(cryptonote_format_utils_basic
|
||||||
|
PUBLIC
|
||||||
|
cncrypto
|
||||||
|
)
|
||||||
|
|
||||||
set(cryptonote_basic_sources
|
set(cryptonote_basic_sources
|
||||||
account.cpp
|
account.cpp
|
||||||
connection_context.cpp
|
connection_context.cpp
|
||||||
@ -74,6 +82,7 @@ target_link_libraries(cryptonote_basic
|
|||||||
common
|
common
|
||||||
cncrypto
|
cncrypto
|
||||||
checkpoints
|
checkpoints
|
||||||
|
cryptonote_format_utils_basic
|
||||||
device
|
device
|
||||||
${Boost_DATE_TIME_LIBRARY}
|
${Boost_DATE_TIME_LIBRARY}
|
||||||
${Boost_PROGRAM_OPTIONS_LIBRARY}
|
${Boost_PROGRAM_OPTIONS_LIBRARY}
|
||||||
|
@ -139,22 +139,6 @@ namespace cryptonote
|
|||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------
|
|
||||||
void get_transaction_prefix_hash(const transaction_prefix& tx, crypto::hash& h)
|
|
||||||
{
|
|
||||||
std::ostringstream s;
|
|
||||||
binary_archive<true> a(s);
|
|
||||||
::serialization::serialize(a, const_cast<transaction_prefix&>(tx));
|
|
||||||
crypto::cn_fast_hash(s.str().data(), s.str().size(), h);
|
|
||||||
}
|
|
||||||
//---------------------------------------------------------------
|
|
||||||
crypto::hash get_transaction_prefix_hash(const transaction_prefix& tx)
|
|
||||||
{
|
|
||||||
crypto::hash h = null_hash;
|
|
||||||
get_transaction_prefix_hash(tx, h);
|
|
||||||
return h;
|
|
||||||
}
|
|
||||||
//---------------------------------------------------------------
|
|
||||||
bool expand_transaction_1(transaction &tx, bool base_only)
|
bool expand_transaction_1(transaction &tx, bool base_only)
|
||||||
{
|
{
|
||||||
if (tx.version >= 2 && !is_coinbase(tx))
|
if (tx.version >= 2 && !is_coinbase(tx))
|
||||||
|
49
src/cryptonote_basic/cryptonote_format_utils_basic.cpp
Normal file
49
src/cryptonote_basic/cryptonote_format_utils_basic.cpp
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
// Copyright (c) 2014-2021, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
//
|
||||||
|
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
|
||||||
|
|
||||||
|
#include "cryptonote_format_utils.h"
|
||||||
|
|
||||||
|
namespace cryptonote
|
||||||
|
{
|
||||||
|
void get_transaction_prefix_hash(const transaction_prefix& tx, crypto::hash& h)
|
||||||
|
{
|
||||||
|
std::ostringstream s;
|
||||||
|
binary_archive<true> a(s);
|
||||||
|
::serialization::serialize(a, const_cast<transaction_prefix&>(tx));
|
||||||
|
crypto::cn_fast_hash(s.str().data(), s.str().size(), h);
|
||||||
|
}
|
||||||
|
|
||||||
|
crypto::hash get_transaction_prefix_hash(const transaction_prefix& tx)
|
||||||
|
{
|
||||||
|
crypto::hash h = crypto::null_hash;
|
||||||
|
get_transaction_prefix_hash(tx, h);
|
||||||
|
return h;
|
||||||
|
}
|
||||||
|
}
|
@ -71,6 +71,7 @@ target_link_libraries(device
|
|||||||
PUBLIC
|
PUBLIC
|
||||||
${HIDAPI_LIBRARIES}
|
${HIDAPI_LIBRARIES}
|
||||||
cncrypto
|
cncrypto
|
||||||
|
cryptonote_format_utils_basic
|
||||||
ringct_basic
|
ringct_basic
|
||||||
wallet-crypto
|
wallet-crypto
|
||||||
${OPENSSL_CRYPTO_LIBRARIES}
|
${OPENSSL_CRYPTO_LIBRARIES}
|
||||||
|
@ -71,10 +71,13 @@ target_link_libraries(wallet_api
|
|||||||
mnemonics
|
mnemonics
|
||||||
${LMDB_LIBRARY}
|
${LMDB_LIBRARY}
|
||||||
${Boost_CHRONO_LIBRARY}
|
${Boost_CHRONO_LIBRARY}
|
||||||
|
${Boost_LOCALE_LIBRARY}
|
||||||
|
${ICU_LIBRARIES}
|
||||||
${Boost_SERIALIZATION_LIBRARY}
|
${Boost_SERIALIZATION_LIBRARY}
|
||||||
${Boost_FILESYSTEM_LIBRARY}
|
${Boost_FILESYSTEM_LIBRARY}
|
||||||
${Boost_SYSTEM_LIBRARY}
|
${Boost_SYSTEM_LIBRARY}
|
||||||
${Boost_THREAD_LIBRARY}
|
${Boost_THREAD_LIBRARY}
|
||||||
|
${CMAKE_THREAD_LIBS_INIT}
|
||||||
${Boost_REGEX_LIBRARY}
|
${Boost_REGEX_LIBRARY}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${EXTRA_LIBRARIES})
|
${EXTRA_LIBRARIES})
|
||||||
|
Loading…
Reference in New Issue
Block a user