From 7e30f35cfc42ac3983dfa281d554df9aa9485a99 Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Sat, 1 Oct 2016 10:02:15 +0200 Subject: Fixes the build for mxe-cross-builds, and if building shared libraries. --- node/CMakeLists.txt | 13 ++++++++++--- node/node.cpp | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'node') 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) { -- cgit v1.2.3-70-g09d2