Fixed Windows 7 compatibility
This commit is contained in:
2
.github/workflows/c-cpp.yml
vendored
2
.github/workflows/c-cpp.yml
vendored
@@ -345,7 +345,7 @@ jobs:
|
|||||||
- name: Build libcurl
|
- name: Build libcurl
|
||||||
run: |
|
run: |
|
||||||
cd external/src/curl
|
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)
|
make -j$(nproc)
|
||||||
cd lib && mkdir .libs && cp libcurl.a .libs
|
cd lib && mkdir .libs && cp libcurl.a .libs
|
||||||
|
|
||||||
|
|||||||
@@ -164,6 +164,8 @@ if (WIN32)
|
|||||||
set(LIBS ${LIBS} bcrypt)
|
set(LIBS ${LIBS} bcrypt)
|
||||||
endif()
|
endif()
|
||||||
add_definitions(-DCURL_STATICLIB)
|
add_definitions(-DCURL_STATICLIB)
|
||||||
|
add_definitions(-DWIN32_LEAN_AND_MEAN)
|
||||||
|
add_definitions(-D_WIN32_WINNT=0x0600)
|
||||||
elseif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
|
elseif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
|
||||||
set(LIBS ${LIBS} pthread)
|
set(LIBS ${LIBS} pthread)
|
||||||
elseif (NOT APPLE)
|
elseif (NOT APPLE)
|
||||||
|
|||||||
BIN
external/lib/libcurl/Debug/libcurl-d.lib
vendored
BIN
external/lib/libcurl/Debug/libcurl-d.lib
vendored
Binary file not shown.
BIN
external/lib/libcurl/Debug/libcurl-d.pdb
vendored
BIN
external/lib/libcurl/Debug/libcurl-d.pdb
vendored
Binary file not shown.
BIN
external/lib/libcurl/Release/libcurl.lib
vendored
BIN
external/lib/libcurl/Release/libcurl.lib
vendored
Binary file not shown.
BIN
external/lib/libcurl/Release/libcurl.pdb
vendored
BIN
external/lib/libcurl/Release/libcurl.pdb
vendored
Binary file not shown.
BIN
external/lib/libuv/Debug/libuv.lib
vendored
BIN
external/lib/libuv/Debug/libuv.lib
vendored
Binary file not shown.
BIN
external/lib/libuv/Debug/libuv.pdb
vendored
BIN
external/lib/libuv/Debug/libuv.pdb
vendored
Binary file not shown.
BIN
external/lib/libuv/Release/libuv.lib
vendored
BIN
external/lib/libuv/Release/libuv.lib
vendored
Binary file not shown.
BIN
external/lib/libuv/Release/libuv.pdb
vendored
BIN
external/lib/libuv/Release/libuv.pdb
vendored
Binary file not shown.
2
external/src/libuv
vendored
2
external/src/libuv
vendored
Submodule external/src/libuv updated: 701acd5940...26d43f49ff
@@ -67,10 +67,18 @@
|
|||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
|
#ifndef WIN32_LEAN_AND_MEAN
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef NOMINMAX
|
#ifndef NOMINMAX
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef _WIN32_WINNT
|
||||||
|
#define _WIN32_WINNT 0x0600
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
|
|
||||||
#elif defined(__linux__) || defined(__unix__) || defined(_POSIX_VERSION) || defined(__MACH__)
|
#elif defined(__linux__) || defined(__unix__) || defined(_POSIX_VERSION) || defined(__MACH__)
|
||||||
|
|||||||
Reference in New Issue
Block a user