diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 649e8ec..ac8ada7 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -345,7 +345,7 @@ jobs: - name: Build libcurl run: | cd external/src/curl - cmake . -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=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 + cmake . -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DCURL_TARGET_WINDOWS_VERSION=0x0600 -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e34115..61864c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,6 +164,8 @@ if (WIN32) set(LIBS ${LIBS} bcrypt) endif() add_definitions(-DCURL_STATICLIB) + add_definitions(-DWIN32_LEAN_AND_MEAN) + add_definitions(-D_WIN32_WINNT=0x0600) elseif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) set(LIBS ${LIBS} pthread) elseif (NOT APPLE) diff --git a/external/lib/libcurl/Debug/libcurl-d.lib b/external/lib/libcurl/Debug/libcurl-d.lib index 2213d00..da63dfb 100644 Binary files a/external/lib/libcurl/Debug/libcurl-d.lib and b/external/lib/libcurl/Debug/libcurl-d.lib differ diff --git a/external/lib/libcurl/Debug/libcurl-d.pdb b/external/lib/libcurl/Debug/libcurl-d.pdb index 5aaaef6..d2ed0f4 100644 Binary files a/external/lib/libcurl/Debug/libcurl-d.pdb and b/external/lib/libcurl/Debug/libcurl-d.pdb differ diff --git a/external/lib/libcurl/Release/libcurl.lib b/external/lib/libcurl/Release/libcurl.lib index 8b898b7..a22d5c8 100644 Binary files a/external/lib/libcurl/Release/libcurl.lib and b/external/lib/libcurl/Release/libcurl.lib differ diff --git a/external/lib/libcurl/Release/libcurl.pdb b/external/lib/libcurl/Release/libcurl.pdb index 6dbd966..082c7e9 100644 Binary files a/external/lib/libcurl/Release/libcurl.pdb and b/external/lib/libcurl/Release/libcurl.pdb differ diff --git a/external/lib/libuv/Debug/libuv.lib b/external/lib/libuv/Debug/libuv.lib index 5eebd17..ba33541 100644 Binary files a/external/lib/libuv/Debug/libuv.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 index f5543b9..a6a801d 100644 Binary files a/external/lib/libuv/Debug/libuv.pdb and b/external/lib/libuv/Debug/libuv.pdb differ diff --git a/external/lib/libuv/Release/libuv.lib b/external/lib/libuv/Release/libuv.lib index 4fb2f31..bceb9d2 100644 Binary files a/external/lib/libuv/Release/libuv.lib and b/external/lib/libuv/Release/libuv.lib differ diff --git a/external/lib/libuv/Release/libuv.pdb b/external/lib/libuv/Release/libuv.pdb index ddb35da..11a3114 100644 Binary files a/external/lib/libuv/Release/libuv.pdb and b/external/lib/libuv/Release/libuv.pdb differ diff --git a/external/src/libuv b/external/src/libuv index 701acd5..26d43f4 160000 --- a/external/src/libuv +++ b/external/src/libuv @@ -1 +1 @@ -Subproject commit 701acd594028eff899c115f0260dcdc184372b8f +Subproject commit 26d43f49ffaeb0c59471b3bdf6e189a5f2a51d63 diff --git a/src/common.h b/src/common.h index e8463b6..f52a02e 100644 --- a/src/common.h +++ b/src/common.h @@ -67,10 +67,18 @@ #ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif + #ifndef NOMINMAX #define NOMINMAX #endif + +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#endif + #include #elif defined(__linux__) || defined(__unix__) || defined(_POSIX_VERSION) || defined(__MACH__)