Skip to content
Snippets Groups Projects
Commit 29c4ff8d authored by ANTA's avatar ANTA
Browse files

1.1-11-Win

parent 53a3ef9b
No related branches found
No related tags found
1 merge request!1Master
...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project (dap_chain_cs_dag) project (dap_chain_cs_dag)
set(DAP_CHAIN_DAG_SRCS set(DAP_CHAIN_DAG_SRCS
dap_chain_cs_dag.c dap_chain_cs_dag.c
dap_chain_cs_dag_event.c dap_chain_cs_dag_event.c
) )
...@@ -11,8 +11,19 @@ set(DAP_CHAIN_DAG_HEADERS ...@@ -11,8 +11,19 @@ set(DAP_CHAIN_DAG_HEADERS
dap_chain_cs_dag_event.h dap_chain_cs_dag_event.h
) )
add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_DAG_SRCS} ${DAP_CHAIN_DAG_HEADERS}) if(WIN32)
include_directories(../libdap/src/win32/)
include_directories(../3rdparty/libmemcached/)
include_directories(../3rdparty/libmemcached/win32/)
include_directories(../3rdparty/wepoll/include/)
include_directories(../3rdparty/uthash/src/)
include_directories(../3rdparty/libjson-c/)
include_directories(../3rdparty/libmagic/src/)
include_directories(../3rdparty/curl/include/)
include_directories(../3rdparty/libsqlite3/)
endif()
add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_DAG_SRCS} ${DAP_CHAIN_DAG_HEADERS})
target_link_libraries(dap_chain_cs_dag dap_core dap_crypto dap_chain dap_chain_net dap_chain_crypto dap_chain_global_db) target_link_libraries(dap_chain_cs_dag dap_core dap_crypto dap_chain dap_chain_net dap_chain_crypto dap_chain_global_db)
target_include_directories(dap_chain_cs_dag INTERFACE .) target_include_directories(dap_chain_cs_dag INTERFACE .)
......
...@@ -26,6 +26,17 @@ ...@@ -26,6 +26,17 @@
#include <pthread.h> #include <pthread.h>
#include "uthash.h" #include "uthash.h"
#ifdef _WIN32
#include <winsock2.h>
#include <windows.h>
#include <mswsock.h>
#include <ws2tcpip.h>
#include <io.h>
#include <time.h>
#include <wepoll.h>
#include <pthread.h>
#endif
#include "dap_common.h" #include "dap_common.h"
#include "dap_string.h" #include "dap_string.h"
#include "dap_strfuncs.h" #include "dap_strfuncs.h"
......
...@@ -56,7 +56,13 @@ dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_new(dap_chain_id_t a_chain_id, ...@@ -56,7 +56,13 @@ dap_chain_cs_dag_event_t * dap_chain_cs_dag_event_new(dap_chain_id_t a_chain_id,
l_event_new = DAP_NEW_Z_SIZE(dap_chain_cs_dag_event_t, l_event_new = DAP_NEW_Z_SIZE(dap_chain_cs_dag_event_t,
l_event_size l_event_size
); );
#ifdef _WIN32
l_event_new->header.ts_created = (uint64_t) gmtime(NULL);
#else
l_event_new->header.ts_created = (uint64_t) timegm(NULL); l_event_new->header.ts_created = (uint64_t) timegm(NULL);
#endif
l_event_new->header.cell_id.uint64 = a_cell_id.uint64; l_event_new->header.cell_id.uint64 = a_cell_id.uint64;
l_event_new->header.chain_id.uint64 = a_chain_id.uint64; l_event_new->header.chain_id.uint64 = a_chain_id.uint64;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment