diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 96237b9..34914f5 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -198,14 +198,14 @@ jobs: uses: eine/setup-msys2@v2 with: update: true - install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake make autoconf libtool automake + install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake make - name: Build libcurl run: | cd external/src/curl - autoreconf -fi - ./configure CFLAGS='-Os' --without-ssl --without-hyper --without-zlib --without-brotli --without-zstd --without-default-ssl-backend --without-ca-bundle --without-ca-path --without-ca-fallback --without-libpsl --without-libgsasl --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --without-ngtcp2 --without-nghttp3 --without-quiche --without-msh3 --without-zsh-functions-dir --without-fish-functions-dir --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-mqtt --disable-manual --disable-ntlm --disable-ntlm-wb --disable-tls-srp --disable-unix-sockets --disable-cookies --disable-socketpair --disable-doh --disable-dateparse --disable-netrc --disable-progress-meter --disable-dnsshuffle --disable-hsts --disable-alt-svc --disable-ares + cmake . -G "Unix Makefiles" -DCMAKE_C_FLAGS="-Os" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_CRYPTO_AUTH=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF make -j$(nproc) + cd lib && mkdir .libs && cp libcurl.a .libs - name: Build libuv run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 6788cff..d628759 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ if (WITH_UPNP) endif() if (WIN32) - set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi) + set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi dbghelp) if (CMAKE_CXX_COMPILER_ID MATCHES GNU) set(LIBS ${LIBS} bcrypt) endif() @@ -163,8 +163,8 @@ endif() if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_5 PATHS "external/lib/libzmq/Debug") find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_5 PATHS "external/lib/libzmq/Release") - find_library(UV_LIBRARY_DEBUG NAMES uv_a PATHS "external/lib/libuv/Debug") - find_library(UV_LIBRARY NAMES uv_a PATHS "external/lib/libuv/Release") + find_library(UV_LIBRARY_DEBUG NAMES libuv PATHS "external/lib/libuv/Debug") + find_library(UV_LIBRARY NAMES libuv PATHS "external/lib/libuv/Release") find_library(CURL_LIBRARY_DEBUG NAMES libcurld PATHS "external/lib/libcurl/Debug") find_library(CURL_LIBRARY NAMES libcurl PATHS "external/lib/libcurl/Release") add_definitions(-D_DISABLE_VECTOR_ANNOTATION) @@ -336,7 +336,7 @@ if (STATIC_BINARY OR STATIC_LIBS) target_link_libraries(${CMAKE_PROJECT_NAME} "${CMAKE_SOURCE_DIR}/external/src/libzmq/build/lib/libzmq.a" - "${CMAKE_SOURCE_DIR}/external/src/libuv/build/libuv_a.a" + "${CMAKE_SOURCE_DIR}/external/src/libuv/build/libuv.a" "${CMAKE_SOURCE_DIR}/external/src/curl/lib/.libs/libcurl.a" ${STATIC_LIBS} ) diff --git a/external/lib/libuv/Debug/uv_a.lib b/external/lib/libuv/Debug/libuv.lib similarity index 51% rename from external/lib/libuv/Debug/uv_a.lib rename to external/lib/libuv/Debug/libuv.lib index 57d1463..eb0923f 100644 Binary files a/external/lib/libuv/Debug/uv_a.lib and b/external/lib/libuv/Debug/libuv.lib differ diff --git a/external/lib/libuv/Debug/libuv.pdb b/external/lib/libuv/Debug/libuv.pdb new file mode 100644 index 0000000..a3d2b09 Binary files /dev/null and b/external/lib/libuv/Debug/libuv.pdb differ diff --git a/external/lib/libuv/Debug/uv_a.pdb b/external/lib/libuv/Debug/uv_a.pdb deleted file mode 100644 index 161c505..0000000 Binary files a/external/lib/libuv/Debug/uv_a.pdb and /dev/null differ diff --git a/external/lib/libuv/Release/libuv.lib b/external/lib/libuv/Release/libuv.lib new file mode 100644 index 0000000..628fa62 Binary files /dev/null and b/external/lib/libuv/Release/libuv.lib differ diff --git a/external/lib/libuv/Release/uv_a.lib b/external/lib/libuv/Release/uv_a.lib deleted file mode 100644 index 947447c..0000000 Binary files a/external/lib/libuv/Release/uv_a.lib and /dev/null differ diff --git a/external/src/libuv b/external/src/libuv index 55077af..7bb8ba6 160000 --- a/external/src/libuv +++ b/external/src/libuv @@ -1 +1 @@ -Subproject commit 55077af4b50e13c5b7c02131ff16695685478fc8 +Subproject commit 7bb8ba6afcc88516f84a5b6798739005c511290e diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 659cd1d..be195fe 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -95,7 +95,7 @@ include_directories(src) include_directories(googletest/googletest/include) if (WIN32) - set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi) + set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi dbghelp) if (CMAKE_CXX_COMPILER_ID MATCHES GNU) set(LIBS ${LIBS} bcrypt) endif() @@ -107,16 +107,16 @@ endif() if (STATIC_LIBS) set(ZMQ_LIBRARY "${CMAKE_SOURCE_DIR}/../external/src/libzmq/build/lib/libzmq.a") set(ZMQ_LIBRARY_DEBUG "${CMAKE_SOURCE_DIR}/../external/src/libzmq/build/lib/libzmq.a") - set(UV_LIBRARY_DEBUG "${CMAKE_SOURCE_DIR}/../external/src/libuv/build/libuv_a.a") - set(UV_LIBRARY "${CMAKE_SOURCE_DIR}/../external/src/libuv/build/libuv_a.a") + set(UV_LIBRARY_DEBUG "${CMAKE_SOURCE_DIR}/../external/src/libuv/build/libuv.a") + set(UV_LIBRARY "${CMAKE_SOURCE_DIR}/../external/src/libuv/build/libuv.a") set(CURL_LIBRARY_DEBUG "${CMAKE_SOURCE_DIR}/../external/src/curl/lib/.libs/libcurl.a") set(CURL_LIBRARY "${CMAKE_SOURCE_DIR}/../external/src/curl/lib/.libs/libcurl.a") else() if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_5 PATHS "../external/lib/libzmq/Debug") find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_5 PATHS "../external/lib/libzmq/Release") - find_library(UV_LIBRARY_DEBUG NAMES uv_a PATHS "../external/lib/libuv/Debug") - find_library(UV_LIBRARY NAMES uv_a PATHS "../external/lib/libuv/Release") + find_library(UV_LIBRARY_DEBUG NAMES libuv PATHS "../external/lib/libuv/Debug") + find_library(UV_LIBRARY NAMES libuv PATHS "../external/lib/libuv/Release") find_library(CURL_LIBRARY_DEBUG NAMES libcurld PATHS "../external/lib/libcurl/Debug") find_library(CURL_LIBRARY NAMES libcurl PATHS "../external/lib/libcurl/Release") add_definitions(-D_DISABLE_VECTOR_ANNOTATION)