From 54fbf3f6e21aa20d226251bc798e7b2450955df1 Mon Sep 17 00:00:00 2001 From: ANTA <arcticshine999@gmail.com> Date: Mon, 15 Jul 2019 19:35:56 +0400 Subject: [PATCH] 1.1-11-Win --- CMakeLists.txt | 28 +++++++++++++++++++++++++--- dap_chain_net_srv.c | 18 ++++++++++++++++++ dap_chain_net_srv_common.c | 19 +++++++++++++++++++ 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 054d60b..35d8ca6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8) project (dap_chain_net_srv) set(DAP_CHAIN_NET_SRV_SRCS - dap_chain_net_srv.c - dap_chain_net_srv_common.c + dap_chain_net_srv.c + dap_chain_net_srv_common.c ) set(DAP_CHAIN_NET_SRV_HEADERS @@ -11,10 +11,32 @@ set(DAP_CHAIN_NET_SRV_HEADERS dap_chain_net_srv_common.h ) +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() + +if(WIN32) + include_directories(../libdap-server-http-db-auth/) +endif() + add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_NET_SRV_SRCS} ${DAP_CHAIN_NET_SRV_HEADERS}) +if(WIN32) + target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net) +endif() + +if(UNIX) + target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net dap_server_http_db_auth) +endif() -target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net dap_server_http_db_auth) target_include_directories(dap_chain_net_srv INTERFACE .) set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE) diff --git a/dap_chain_net_srv.c b/dap_chain_net_srv.c index 5748f83..24b23b2 100755 --- a/dap_chain_net_srv.c +++ b/dap_chain_net_srv.c @@ -22,9 +22,27 @@ You should have received a copy of the GNU General Public License along with any DAP based project. If not, see <http://www.gnu.org/licenses/>. */ +#include <stdlib.h> +#include <stdio.h> +#include <time.h> +#include <stdlib.h> +#include <stddef.h> +#include <stdint.h> + +#ifdef WIN32 +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#include <winsock2.h> +#include <windows.h> +#include <mswsock.h> +#include <ws2tcpip.h> +#include <io.h> +#include <wepoll.h> +#endif #include <pthread.h> + #include "uthash.h" #include "utlist.h" #include "dap_list.h" diff --git a/dap_chain_net_srv_common.c b/dap_chain_net_srv_common.c index c3b1a6c..0f593e2 100755 --- a/dap_chain_net_srv_common.c +++ b/dap_chain_net_srv_common.c @@ -23,7 +23,26 @@ along with any DAP based project. If not, see <http://www.gnu.org/licenses/>. */ +#include <stdlib.h> +#include <stdio.h> +#include <time.h> +#include <stdlib.h> +#include <stddef.h> #include <stdint.h> + +#ifdef WIN32 +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#include <winsock2.h> +#include <windows.h> +#include <mswsock.h> +#include <ws2tcpip.h> +#include <io.h> +#include <wepoll.h> +#endif + +#include <pthread.h> + #include "dap_strfuncs.h" #include "rand/dap_rand.h" #include "dap_chain_datum_tx_items.h" -- GitLab