From a382b925bf31dd76bb78e6b8c399bca7466c3df3 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <dm@cifercom.com>
Date: Tue, 14 Aug 2018 09:19:30 +0700
Subject: [PATCH] [*] New libs versions [*] Build error fixes, some renames
---
CMakeLists.txt | 4 ++--
libdap-chain | 2 +-
libdap-server | 2 +-
sources/node_manager.c | 4 +++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ed0d58b..6309d3cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ add_definitions ("-DDAP_SERVER")
add_subdirectory(libdap-server)
add_subdirectory(libdap)
-#add_subdirectory(libdap-chain)
+add_subdirectory(libdap-chain)
add_subdirectory(libdap-stream)
@@ -43,4 +43,4 @@ set(HEADERS sources/node_manager.h)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
add_executable(${PROJECT_NAME} "sources/kelvin-node.c" ${HEADERS} ${SOURCES} ${CRYPTO_SRCS})
-target_link_libraries(${PROJECT_NAME} dap_http_server dap_core_server dap_udp_server dap_session dap_crypto dap_client dap_core dap_http dap_enc_server dap_stream m pthread)
\ No newline at end of file
+target_link_libraries(${PROJECT_NAME} dap_http_server dap_core_server dap_udp_server dap_session dap_crypto dap_core dap_enc_server dap_stream m pthread)
diff --git a/libdap-chain b/libdap-chain
index a4133845..0ea81182 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit a41338453ba7be6320d7533a560ed56a7419396c
+Subproject commit 0ea8118293ceb1188befe07ed43982c3328b645f
diff --git a/libdap-server b/libdap-server
index f4d20ce6..6366bcea 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit f4d20ce6161fc705abe4b526c7e91b8f6564131f
+Subproject commit 6366bceae27b633d32630053c9fd295f07db7435
diff --git a/sources/node_manager.c b/sources/node_manager.c
index e74742c3..679278a3 100644
--- a/sources/node_manager.c
+++ b/sources/node_manager.c
@@ -19,7 +19,9 @@
*/
#include "node_manager.h"
+#include "dap_enc_http.h"
#include "dap_http.h"
+#include "dap_http_simple.h"
#include "stream.h"
#include "stream_ch_pkt.h"
@@ -127,7 +129,7 @@ void node_manager_deinit(){
dap_client_deinit();
dap_enc_key_deinit();
dap_enc_deinit();
- common_deinit();
+ dap_common_deinit();
dap_config_deinit();
}
--
GitLab