Skip to content
Snippets Groups Projects
Commit 0d87304e authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'master' into 'bugs-2706' 

# Conflicts:
#   CMakeLists.txt
parents 02652f21 39f9f3f9
No related branches found
No related tags found
1 merge request!4wepoll issues
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 2 deletions
CMakeLists.txt
+ 1
− 2
View file @ 0d87304e
...@@ -5,8 +5,7 @@ set(VPN_SRCS dap_stream_ch_vpn.c) ...@@ -5,8 +5,7 @@ set(VPN_SRCS dap_stream_ch_vpn.c)
if(WIN32) if(WIN32)
include_directories(../libdap/src/win32/) include_directories(../libdap/src/win32/)
include_directories(../3rdparty/libmemcached/) include_directories(../3rdparty/wepoll/include/)
include_directories(../3rdparty/libmemcached/win32/)
include_directories(../3rdparty/uthash/src/) include_directories(../3rdparty/uthash/src/)
include_directories(../3rdparty/libjson-c/) include_directories(../3rdparty/libjson-c/)
include_directories(../3rdparty/curl/include/) include_directories(../3rdparty/curl/include/)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment