Linking errors

enc_server/CMakeLists.txt

@@ -11,23 +11,16 @@ if(WIN32)
     add_definitions ("-D__WINDOWS__")
     add_definitions ("-D_CRT_SECURE_NO_WARNINGS")
     add_definitions ("-DCURL_STATICLIB")
-#    add_definitions ("-DDAP_SERVER NODE_NETNAME=\"kelvin\"")
 
-  include_directories(../../libdap/src/win32/)
-  include_directories(../../3rdparty/wepoll/include/)
+  include_directories(../../3rdparty/wepoll/)
   include_directories(../../3rdparty/uthash/src/)
-  include_directories(../../3rdparty/libjson-c/)
-  include_directories(../../3rdparty/curl/include/)
 endif()
 
 add_library(${PROJECT_NAME} STATIC ${DAP_ENC_SERVER_SRCS})
 
 if(WIN32)
-  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core dap_http_server
-
-  #${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
+  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core dap_http_server json-c
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
   KERNEL32
   USER32
   SHELL32

http_server/CMakeLists.txt

@@ -20,13 +20,10 @@ if(WIN32)
     add_definitions ("-D__WINDOWS__")
     add_definitions ("-D_CRT_SECURE_NO_WARNINGS")
     add_definitions ("-DCURL_STATICLIB")
-#    add_definitions ("-DDAP_SERVER NODE_NETNAME=\"kelvin\"")
 
-  include_directories(../../libdap/src/win32/)
-  include_directories(../../3rdparty/wepoll/include/)
+  include_directories(../../3rdparty/wepoll/)
   include_directories(../../3rdparty/uthash/src/)
-  include_directories(../../3rdparty/libjson-c/)
-  include_directories(../../3rdparty/curl/include/)
+  #include_directories(../../3rdparty/curl/include/)
 endif()
 
 add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
@@ -35,10 +32,7 @@ target_include_directories(dap_http_server INTERFACE . http_client)
 
 if(WIN32)
   target_link_libraries(dap_http_server dap_core dap_crypto dap_server_core magic regex tre intl iconv
-
- 
- #${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
+      ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
   KERNEL32
   USER32
   SHELL32

http_server/http_client/dap_http_client_simple.c

@@ -19,7 +19,7 @@
 #include <time.h>
 #endif
 
-#include <curl/curl.h>
+#include "curl/curl.h"
 
 #include "dap_common.h"
 #include "dap_http_client.h"