Merge branch 'master' of https://gitlab.demlabs.net/cellframe/cellframe-sdk

.gitmodules

@@ -98,3 +98,19 @@
 	path = libdap-app-cli
 	url = https://gitlab.demlabs.net/cellframe/libdap-app-cli.git
 	branch = master
+[submodule "libdap-chain-net-srv-app"]
+	path = libdap-chain-net-srv-app
+	url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-app
+	branch = master
+[submodule "libdap-chain-net-srv-app-db"]
+	path = libdap-chain-net-srv-app-db
+	url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-app-db
+	branch = master
+[submodule "libdap-chain-net-srv-datum"]
+	path = libdap-chain-net-srv-datum
+	url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-datum
+	branch = master
+[submodule "libdap-chain-net-srv-datum-pool"]
+	path = libdap-chain-net-srv-datum-pool
+	url = https://gitlab.demlabs.net/cellframe/libdap-chain-net-srv-datum-pool
+	branch = master

CMakeLists.txt

@@ -14,6 +14,21 @@ else()
     SET(DAP_RELEASE ON)
 endif()
 
+# Check whether we're on a 32-bit or 64-bit system
+if(CMAKE_SIZEOF_VOID_P EQUAL "8")
+  set(DEFAULT_BUILD_64 ON)
+else()
+  set(DEFAULT_BUILD_64 OFF)
+endif()
+option(BUILD_64 "Build for 64-bit? 'OFF' builds for 32-bit." ${DEFAULT_BUILD_64})
+
+if(BUILD_64)
+  set(ARCH_WIDTH "64")
+else()
+  set(ARCH_WIDTH "32")
+endif()
+message(STATUS "Building for a ${ARCH_WIDTH}-bit system")
+
 if(UNIX)
   add_definitions ("-DDAP_OS_LINUX -DDAP_OS_UNIX")
 # add_definitions ("-DDAP_LOG_MT")
@@ -46,6 +61,8 @@ endif()
 
 
 if(WIN32)
+  message(STATUS "Building for Windows")
+
 
   add_definitions ("-DUNDEBUG")
   add_definitions ("-DNDEBUG")
@@ -97,7 +114,14 @@ add_subdirectory(libdap-stream-ch-chain-net)
 add_subdirectory(libdap-stream-ch-chain)
 add_subdirectory(libdap-server-udp)
 add_subdirectory(libdap-chain-net-srv)
-add_subdirectory(libdap-chain-net-srv-vpn)
+if(NOT (WIN32))
+  add_subdirectory(libdap-chain-net-srv-vpn)
+  add_subdirectory(libdap-chain-net-srv-app)
+  add_subdirectory(libdap-chain-net-srv-app-db)
+  add_subdirectory(libdap-chain-net-srv-datum)
+  add_subdirectory(libdap-chain-net-srv-datum-pool)
+endif()
+
 add_subdirectory(libdap-chain-gdb)
 add_subdirectory(libdap-stream-ch-chain-net-srv)
 add_subdirectory(libdap-chain-cs-dag)
@@ -106,14 +130,25 @@ add_subdirectory(libdap-chain-cs-dag-pos)
 
 add_library(${PROJECT_NAME} STATIC cellframe-sdk.c)
 
-target_link_libraries(${PROJECT_NAME}  dap_core dap_crypto dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
-        dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
-        dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
-        dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
-        dap_chain_net dap_chain_net_srv
-        dap_chain_net_srv_vpn
-        dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb m magic
-        dap_cuttdb   )
+if(NOT (WIN32))
+    target_link_libraries(${PROJECT_NAME}  dap_core dap_crypto dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
+            dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
+            dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
+            dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
+            dap_chain_net dap_chain_net_srv
+            dap_chain_net_srv_vpn dap_chain_net_srv_app  dap_chain_net_srv_app_db
+            dap_chain_net_srv_datum  dap_chain_net_srv_datum_pool
+            dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb m magic
+            dap_cuttdb   )
+else()
+    target_link_libraries(${PROJECT_NAME}  dap_core dap_crypto dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session
+            dap_enc_server dap_stream dap_stream_ch_chain dap_stream_ch_chain_net
+            dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client
+            dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos
+            dap_chain_net dap_chain_net_srv
+            dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb m magic
+            dap_cuttdb   )
+endif()
 #target_link_libraries(${PROJECT_NAME} dap_core dap_crypto)
 
 #target_include_directories(${PROJECT_NAME} INTERFACE include/)

libdap-app-cli @ 1e888729

-Subproject commit 9ea22d1b113d41545b378df9864a0caba3cf51c4
+Subproject commit 1e888729d80befec68683762707e62b8e61d2a4d

libdap-chain @ d591e366

-Subproject commit b11de781617e3137875fbdab281f26a796474657
+Subproject commit d591e36646bc90ae433b3090626ae9d52882814b

libdap-chain-global-db @ ef72e3e9

-Subproject commit 83e753c15ecdeecc00b0ea9b14a1fb6693b7cbbc
+Subproject commit ef72e3e95eea97d1a17f66c35d184a2ed02e6854

libdap-chain-net @ aa8df144

-Subproject commit f095d214e258c3846088e96a4ff05edc53f47e6b
+Subproject commit aa8df1441323850017d0ed5117e6d5e254225054

libdap-chain-net-srv-app @ dc6e3b30

+Subproject commit dc6e3b30992d3988c7f9f3a159c8286e28bea9ae

libdap-chain-net-srv-app-db @ 99556891

+Subproject commit 995568917a9796dec412ad13124628fb8fff53ba

libdap-chain-net-srv-datum @ a317a59e

+Subproject commit a317a59e7eec49738288a476548906aab6ea43fe

libdap-chain-net-srv-datum-pool @ 640e49fd

+Subproject commit 640e49fdc8c2a78aa9ae0930adcf03e149df6607

libdap-chain-net-srv-vpn @ 76315225

-Subproject commit 77c26fa2203149bb8fc4f40e42eed83c5e41887d
+Subproject commit 763152259fc1e1b8358ea4c406b6de21d677a53f

libdap-client @ f7dbe9db

-Subproject commit 03f1bdc836e332ab90dc33124a9bd2536d8740d4
+Subproject commit f7dbe9db19e6f87c6fe5bb5abf004cde162ed3dd

libdap-server-core @ 9fdcdcb4

-Subproject commit dd803b2e03007c74c792b35a319fd7f9b6e73078
+Subproject commit 9fdcdcb45d041e63a3a4b575424a6f3de7e68ca1

libdap-server-udp @ 608ab1c9

-Subproject commit 7500d54e139a92586b1488edffcb12f4f1c824ec
+Subproject commit 608ab1c9e0f5dac7b8c4f1abac6aa8f13c48ceaa

libdap-stream-ch-chain @ 5d522e33

-Subproject commit 001748d443a4cf8fef1886a6a9846e712967d0fd
+Subproject commit 5d522e3397528df51809bca9143a978d2fe62143

libdap-stream-ch-chain-net @ 5ffbfcbd

-Subproject commit 3c768e4b51cd4dc87893769ee0693992138be675
+Subproject commit 5ffbfcbd2a475b252938bdd1c793dc7c612b105d