diff --git a/enc_server/CMakeLists.txt b/enc_server/CMakeLists.txt index d358c266d12378e883cafde3f99f6c09383886cd..6c6cce0f25ee0beef6f9e5bc3acb7b42bda40fa4 100755 --- a/enc_server/CMakeLists.txt +++ b/enc_server/CMakeLists.txt @@ -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 diff --git a/http_server/CMakeLists.txt b/http_server/CMakeLists.txt index 9fbe44a685ad32a06949e37ecc79b065b0fd2cfe..b8f0b44d1fe3c967a379031f86bfebe088b99221 100755 --- a/http_server/CMakeLists.txt +++ b/http_server/CMakeLists.txt @@ -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