diff options
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/mnemonics/electrum-words.cpp | 7 | ||||
| -rw-r--r-- | src/mnemonics/wordlists/old-word-list (renamed from src/mnemonics/old-word-list) | 0 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 572515b5c..283a510b8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,7 +41,12 @@ file(GLOB_RECURSE SIMPLEWALLET simplewallet/*) file(GLOB_RECURSE CONN_TOOL connectivity_tool/*) file(GLOB_RECURSE WALLET wallet/*) file(GLOB_RECURSE MINER miner/*) -file(GLOB_RECURSE MNEMONICS mnemonics/*) +file(GLOB MNEMONICS mnemonics/*) + +file(GLOB NEW_WORD_LISTS mnemonics/wordlists/languages/*) +file(GLOB OLD_WORD_LIST mnemonics/wordlists/*) +file(COPY ${NEW_WORD_LISTS} DESTINATION "${CMAKE_SOURCE_DIR}/build/release/src/wordlists/languages") +file(COPY ${OLD_WORD_LIST} DESTINATION "${CMAKE_SOURCE_DIR}/build/release/src/wordlists") source_group(common FILES ${COMMON}) source_group(crypto FILES ${CRYPTO}) diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp index 8ab618b16..3d79ecf6e 100644 --- a/src/mnemonics/electrum-words.cpp +++ b/src/mnemonics/electrum-words.cpp @@ -49,8 +49,9 @@ namespace std::map<std::string,uint32_t> words_map; std::vector<std::string> words_array; + const std::string WORD_LISTS_DIRECTORY = "wordlists"; + const std::string LANGUAGES_DIRECTORY = "languages"; const std::string OLD_WORD_FILE = "old-word-list"; - const std::string WORD_LIST_DIRECTORY = "wordlists"; bool is_first_use() { @@ -85,11 +86,11 @@ namespace crypto { if (old_word_list) { - create_data_structures(OLD_WORD_FILE); + create_data_structures(WORD_LISTS_DIRECTORY + '/' + OLD_WORD_FILE); } else { - create_data_structures(WORD_LIST_DIRECTORY + '/' + language); + create_data_structures(WORD_LISTS_DIRECTORY + '/' + LANGUAGES_DIRECTORY + '/' + language); } } diff --git a/src/mnemonics/old-word-list b/src/mnemonics/wordlists/old-word-list index a5184a9ce..a5184a9ce 100644 --- a/src/mnemonics/old-word-list +++ b/src/mnemonics/wordlists/old-word-list diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index e71655e4c..7c1246f32 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -47,6 +47,7 @@ #include "crypto/crypto.h" // for crypto::secret_key definition #include "mnemonics/electrum-words.h" + #if defined(WIN32) #include <crtdbg.h> #endif |