Merge branch 'support_2719' into 'master'

Linking errors

See merge request !28

CMakeLists.txt

@@ -5,12 +5,8 @@ file(GLOB DAP_CHAIN_GLOBAL_DB_SRC *.c)
 file(GLOB DAP_CHAIN_GLOBAL_DB_HDR *.h)
 
 if(WIN32)
-  include_directories(../libdap/src/win32/)
-  include_directories(../3rdparty/wepoll/include/)
+  include_directories(../3rdparty/wepoll/)
   include_directories(../3rdparty/uthash/src/)
-  include_directories(../3rdparty/libjson-c/)
-  include_directories(../3rdparty/curl/include/)
-  include_directories(../3rdparty/libsqlite3/)
 endif()
 
 
@@ -18,17 +14,7 @@ add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_GLOBAL_DB_SRC} ${DAP_CHAIN_GLOBAL
 
 add_subdirectory(libdap-cuttdb)
 
-if(WIN32)
-  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto dap_cuttdb)
-endif()
-if(UNIX)
-  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto sqlite3 dap_cuttdb)
-
-  if(NOT ANDROID)
-      target_link_libraries(${PROJECT_NAME} ldb talloc tevent)
-  endif()
-
-endif()
+target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto sqlite3 dap_cuttdb json-c)
 
 target_include_directories(dap_chain_global_db INTERFACE .)
 

dap_chain_global_db_driver_sqlite.h

@@ -24,7 +24,7 @@
     along with any CellFrame SDK based project.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "sqlite3.h"
+#include <sqlite3.h>
 #include "dap_chain_global_db_driver.h"
 
 int dap_db_driver_sqlite_init(const char *a_filename_db, dap_db_driver_callbacks_t *a_drv_callback);