diff options
| author | Dennis Brentjes <d.brentjes@gmail.com> | 2016-10-01 10:02:15 +0200 |
|---|---|---|
| committer | Dennis Brentjes <d.brentjes@gmail.com> | 2016-10-01 10:02:15 +0200 |
| commit | 7e30f35cfc42ac3983dfa281d554df9aa9485a99 (patch) | |
| tree | 5b11a3e14a2a60cdb80db1fca1d0d3f850f97bac /node | |
| parent | 37effc3e136c73afd4d6ba37d23a91766795d0f7 (diff) | |
| download | cmix-7e30f35cfc42ac3983dfa281d554df9aa9485a99.tar.gz cmix-7e30f35cfc42ac3983dfa281d554df9aa9485a99.tar.bz2 cmix-7e30f35cfc42ac3983dfa281d554df9aa9485a99.zip | |
Fixes the build for mxe-cross-builds, and if building shared libraries.
Diffstat (limited to 'node')
| -rw-r--r-- | node/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | node/node.cpp | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/node/CMakeLists.txt b/node/CMakeLists.txt index adbedb1..6fe0ef7 100644 --- a/node/CMakeLists.txt +++ b/node/CMakeLists.txt @@ -8,9 +8,16 @@ add_executable(node nextnode.hpp nextnode.cpp ) -target_compile_options(node - PRIVATE "-std=c++11" -) +if(WIN32) + target_compile_options(node + PRIVATE "-std=gnu++11" + ) +else(WIN32) + target_compile_options(node + PRIVATE "-std=c++11" + ) +endif(WIN32) + target_link_libraries(node PRIVATE Boost::boost diff --git a/node/node.cpp b/node/node.cpp index 92c51ec..b8416e1 100644 --- a/node/node.cpp +++ b/node/node.cpp @@ -18,6 +18,8 @@ Node::Node(ListenSettings const& listen_settings, NodeNetworkSettings network_se , keypair(api.create_key_pair()) , network_pub_key() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + auto on_connect = [this, network_settings](){ BOOST_LOG_TRIVIAL(trace) << "is first: " << std::boolalpha << network_settings.is_first; if(network_settings.is_first) { |