diff --git a/CMakeLists.txt b/CMakeLists.txt index c2e805e3ced57fafd25266c347da6a629b4340f1..4f677d879eebfcf558c2237f5c5200fa526fb0cd 100755 --- a/CMakeLists.txt +++ b/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 .) diff --git a/dap_chain_global_db_driver_sqlite.h b/dap_chain_global_db_driver_sqlite.h index 2818058580142410e898a2c35bac84c787151b28..2d1175df09dee149211876af69383abed045162f 100755 --- a/dap_chain_global_db_driver_sqlite.h +++ b/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);