aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-02-12 23:24:19 +0200
committerRiccardo Spagni <ric@spagni.net>2017-02-12 23:24:19 +0200
commit47687399fb5b2b3c6d2b9e5b39e0b55c27a7f38e (patch)
tree21414161a056b2746b6865880b4b2df8076b8fe4
parentMerge pull request #1708 (diff)
parentFix GUI building after libcryptonote_core was split (#1626) (diff)
downloadmonero-47687399fb5b2b3c6d2b9e5b39e0b55c27a7f38e.tar.xz
Merge pull request #1709
b2ac939e Fix GUI building after libcryptonote_core was split (#1626) (iDunk5400)
-rw-r--r--src/wallet/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 8626001ce..3c103bc29 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -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 mnemonics common crypto ringct)
+ set(libs_to_merge wallet cryptonote_core cryptonote_basic mnemonics common crypto ringct)
foreach(lib ${libs_to_merge})
list(APPEND objlibs $<TARGET_OBJECTS:obj_${lib}>) # matches naming convention in src/CMakeLists.txt