Merge pull request #8 from cellframe/1.1-11-Win

1.1-11-Win

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 )

dap_udp_client.c

 /*
- 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

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;
 }
+

dap_udp_server.h

 /*
- 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