Skip to content
Snippets Groups Projects
Unverified Commit be35813a authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov Committed by GitHub
Browse files

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

1.1-11-Win
parents f84455a7 54fbf3f6
No related branches found
No related tags found
No related merge requests found
...@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8)
project (dap_chain_net_srv) project (dap_chain_net_srv)
set(DAP_CHAIN_NET_SRV_SRCS set(DAP_CHAIN_NET_SRV_SRCS
dap_chain_net_srv.c dap_chain_net_srv.c
dap_chain_net_srv_common.c dap_chain_net_srv_common.c
) )
set(DAP_CHAIN_NET_SRV_HEADERS set(DAP_CHAIN_NET_SRV_HEADERS
...@@ -11,10 +11,32 @@ set(DAP_CHAIN_NET_SRV_HEADERS ...@@ -11,10 +11,32 @@ set(DAP_CHAIN_NET_SRV_HEADERS
dap_chain_net_srv_common.h 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}) 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 .) target_include_directories(dap_chain_net_srv INTERFACE .)
set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE) set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
......
...@@ -22,9 +22,27 @@ ...@@ -22,9 +22,27 @@
You should have received a copy of the GNU General Public License 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/>. 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 <pthread.h>
#include "uthash.h" #include "uthash.h"
#include "utlist.h" #include "utlist.h"
#include "dap_list.h" #include "dap_list.h"
......
...@@ -23,7 +23,26 @@ ...@@ -23,7 +23,26 @@
along with any DAP based project. If not, see <http://www.gnu.org/licenses/>. 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> #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 "dap_strfuncs.h"
#include "rand/dap_rand.h" #include "rand/dap_rand.h"
#include "dap_chain_datum_tx_items.h" #include "dap_chain_datum_tx_items.h"
......
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