Skip to content
Snippets Groups Projects
Commit 9e7533d5 authored by Constantin Papizh's avatar Constantin Papizh
Browse files

Windows build fixed

parent 4a84966d
No related branches found
No related tags found
1 merge request!3Windows build fixed
......@@ -21,7 +21,6 @@ if(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()
......@@ -31,7 +30,7 @@ if(WIN32)
target_link_libraries(dap_enc_server dap_core dap_crypto dap_server_core dap_http_server
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
#${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
KERNEL32
......
......@@ -30,7 +30,6 @@ if(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()
......@@ -39,10 +38,10 @@ add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
target_include_directories(dap_http_server INTERFACE . http_client)
if(WIN32)
target_link_libraries(dap_http_server dap_core dap_crypto dap_server_core
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]/libmemcached[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
#${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]/wepoll[x86_64CLANG].a
KERNEL32
......
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