From 76426a11e1c279c0ac55ad41859af66de979964c Mon Sep 17 00:00:00 2001
From: ANTA <arcticshine999@gmail.com>
Date: Tue, 16 Jul 2019 03:23:39 +0400
Subject: [PATCH] 1.1-11-Win
---
CMakeLists.txt | 11 +++++++++++
dap_udp_client.c | 4 ++--
dap_udp_server.c | 3 ++-
dap_udp_server.h | 9 ++++-----
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2dad70..3529b03 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,17 @@ endif()
set(DAP_UDP_SERVER_SRCS dap_udp_server.c dap_udp_client.h dap_udp_client.c)
+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/)
+endif()
+
add_library(${PROJECT_NAME} STATIC ${DAP_UDP_SERVER_SRCS})
target_link_libraries(${PROJECT_NAME} dap_core dap_server_core )
diff --git a/dap_udp_client.c b/dap_udp_client.c
index e1e92b4..15b9971 100755
--- a/dap_udp_client.c
+++ b/dap_udp_client.c
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017-2018 (c) Project "DeM Labs Inc" https://github.com/demlabsinc
+ Copyright (c) 2017-2019 (c) Project "DeM Labs Inc" https://demlabs.net
All rights reserved.
This file is part of DAP (Deus Applications Prototypes) the open source project
@@ -45,7 +45,7 @@
#include <mswsock.h>
#include <ws2tcpip.h>
#include <io.h>
-#include "wrappers.h"
+//#include "wrappers.h"
#include <wepoll.h>
#include <pthread.h>
#endif
diff --git a/dap_udp_server.c b/dap_udp_server.c
index f74ecff..dded3f5 100755
--- a/dap_udp_server.c
+++ b/dap_udp_server.c
@@ -47,7 +47,7 @@
#include <mswsock.h>
#include <ws2tcpip.h>
#include <io.h>
-#include "wrappers.h"
+//#include "wrappers.h"
#include <wepoll.h>
#include <pthread.h>
#endif
@@ -443,3 +443,4 @@ error:
return;
}
+
diff --git a/dap_udp_server.h b/dap_udp_server.h
index 94f62a2..3d63356 100755
--- a/dap_udp_server.h
+++ b/dap_udp_server.h
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017-2018 (c) Project "DeM Labs Inc" https://github.com/demlabsinc
+ Copyright (c) 2017-2019 (c) Project "DeM Labs Inc" https://github.com/demlabsinc
All rights reserved.
This file is part of DAP (Deus Applications Prototypes) the open source project
@@ -61,7 +61,6 @@ typedef struct dap_udp_server {
#define DAP_UDP_SERVER(a) ((dap_udp_server_t *) (a)->_inheritor)
-extern void dap_udp_server_delete( dap_server_t *sh );
-extern void dap_udp_server_loop( dap_server_t *udp_server ); // Start server event loop
-extern dap_server_t *dap_udp_server_listen( uint16_t port ); // Create and bind server
-
+void dap_udp_server_delete( dap_server_t *sh );
+void dap_udp_server_loop( dap_server_t *udp_server ); // Start server event loop
+dap_server_t *dap_udp_server_listen( uint16_t port ); // Create and bind serv
--
GitLab