aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-05-30 21:24:11 +0200
committerRiccardo Spagni <ric@spagni.net>2017-05-30 21:24:11 +0200
commita4c13ea09289a2703457467171c84e7ff16fc380 (patch)
treeff139e81887afe74150df0f58a3877a560f9cef2 /src/wallet
parentMerge pull request #2038 (diff)
parentchanged crypto to cncrypto so it generated libcncrypto (diff)
downloadmonero-a4c13ea09289a2703457467171c84e7ff16fc380.tar.xz
Merge pull request #2039
4b932ff3 changed crypto to cncrypto so it generated libcncrypto (Gentian)
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 2e7610b64..639080051 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -108,7 +108,7 @@ if (NOT BUILD_GUI_DEPS)
epee
rpc
cryptonote_core
- crypto
+ cncrypto
common
${Boost_CHRONO_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
@@ -126,7 +126,7 @@ endif()
# build and install libwallet_merged only if we building for GUI
if (BUILD_GUI_DEPS)
- set(libs_to_merge wallet cryptonote_core cryptonote_basic mnemonics common crypto ringct)
+ set(libs_to_merge wallet cryptonote_core cryptonote_basic mnemonics common cncrypto ringct)
foreach(lib ${libs_to_merge})
list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt