nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2032

Browse Source 
dd8e3266 shared libs build (i.e. make debug) (stoffu)
This commit is contained in:
Riccardo Spagni 2017-05-30 21:21:36 +02:00
commit 9ea7fbed8a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -338,6 +338,8 @@ if (UNIX AND NOT APPLE)
find_package(Threads) find_package(Threads)
endif() endif()
add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP)
add_subdirectory(external) add_subdirectory(external)
# Final setup for miniupnpc # Final setup for miniupnpc

2
contrib/epee/src/mlog.cpp
View File

@ -31,8 +31,6 @@
#include <atomic> #include <atomic>
#include "misc_log_ex.h" #include "misc_log_ex.h"
INITIALIZE_EASYLOGGINGPP
#undef MONERO_DEFAULT_LOG_CATEGORY #undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "logging" #define MONERO_DEFAULT_LOG_CATEGORY "logging"

1
src/mnemonics/CMakeLists.txt
View File

@ -55,6 +55,7 @@ monero_add_library(mnemonics
${mnemonics_private_headers}) ${mnemonics_private_headers})
target_link_libraries(mnemonics target_link_libraries(mnemonics
PUBLIC PUBLIC
easylogging
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
PRIVATE PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})