From 29c4ff8dc8c0c34c33a7e44ba01c04a8bf0f52b1 Mon Sep 17 00:00:00 2001
From: ANTA <arcticshine999@gmail.com>
Date: Mon, 15 Jul 2019 19:04:17 +0400
Subject: [PATCH] 1.1-11-Win
---
CMakeLists.txt | 15 +++++++++++++--
dap_chain_cs_dag.c | 11 +++++++++++
dap_chain_cs_dag_event.c | 6 ++++++
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d22b714..edaebb2 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project (dap_chain_cs_dag)
set(DAP_CHAIN_DAG_SRCS
- dap_chain_cs_dag.c
+ dap_chain_cs_dag.c
dap_chain_cs_dag_event.c
)
@@ -11,8 +11,19 @@ set(DAP_CHAIN_DAG_HEADERS
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_include_directories(dap_chain_cs_dag INTERFACE .)
diff --git a/dap_chain_cs_dag.c b/dap_chain_cs_dag.c
index 716eef3..28c3caf 100755
--- a/dap_chain_cs_dag.c
+++ b/dap_chain_cs_dag.c
@@ -26,6 +26,17 @@
#include <pthread.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_string.h"
#include "dap_strfuncs.h"
diff --git a/dap_chain_cs_dag_event.c b/dap_chain_cs_dag_event.c
index 1875e60..468fd7b 100755
--- a/dap_chain_cs_dag_event.c
+++ b/dap_chain_cs_dag_event.c
@@ -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_size
);
+ #ifdef _WIN32
+ l_event_new->header.ts_created = (uint64_t) gmtime(NULL);
+ #else
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.chain_id.uint64 = a_chain_id.uint64;
--
GitLab