From 17e86a61c99a4b88bd545a1134e3fe6c9b79a633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 24 Sep 2020 10:28:24 +0200 Subject: [PATCH] WinNT5.1 networking fixes (#12759) --- src/openrct2/CMakeLists.txt | 2 +- src/openrct2/core/Crypt.CNG.cpp | 2 +- src/openrct2/core/Crypt.OpenSSL.cpp | 2 +- src/openrct2/core/Http.WinHttp.cpp | 2 +- src/openrct2/core/Http.cURL.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt index 8dcd0234d2..88e5e05dff 100644 --- a/src/openrct2/CMakeLists.txt +++ b/src/openrct2/CMakeLists.txt @@ -104,7 +104,7 @@ if (ENABLE_SCRIPTING) find_package(duktape CONFIG REQUIRED) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${DUKTAPE_INCLUDE_DIRS}) if (STATIC) - target_link_libraries(${PROJECT_NAME} ${DUKTAPE_STATIC_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${DUKTAPE_LIBRARY} ${DUKTAPE_STATIC_LIBRARY}) else () target_link_libraries(${PROJECT_NAME} ${DUKTAPE_LIBRARY}) endif () diff --git a/src/openrct2/core/Crypt.CNG.cpp b/src/openrct2/core/Crypt.CNG.cpp index c1d415fded..bd37836fdc 100644 --- a/src/openrct2/core/Crypt.CNG.cpp +++ b/src/openrct2/core/Crypt.CNG.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#if !defined(DISABLE_NETWORK) && defined(_WIN32) +#if !defined(DISABLE_NETWORK) && defined(_WIN32) && (!defined(_WIN32_WINNT) || _WIN32_WINNT >= 0x0600) # include "../platform/Platform2.h" # include "Crypt.h" diff --git a/src/openrct2/core/Crypt.OpenSSL.cpp b/src/openrct2/core/Crypt.OpenSSL.cpp index 6140a16dca..56fbdf0c12 100644 --- a/src/openrct2/core/Crypt.OpenSSL.cpp +++ b/src/openrct2/core/Crypt.OpenSSL.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#if !defined(DISABLE_NETWORK) && !defined(_WIN32) +#if !defined(DISABLE_NETWORK) && (!defined(_WIN32) || (defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600)) # include "Crypt.h" diff --git a/src/openrct2/core/Http.WinHttp.cpp b/src/openrct2/core/Http.WinHttp.cpp index 4b94d6927d..d51e0cc930 100644 --- a/src/openrct2/core/Http.WinHttp.cpp +++ b/src/openrct2/core/Http.WinHttp.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#if !defined(DISABLE_HTTP) && defined(_WIN32) +#if !defined(DISABLE_HTTP) && defined(_WIN32) && (!defined(_WIN32_WINNT) || _WIN32_WINNT >= 0x0600) # include "Http.h" diff --git a/src/openrct2/core/Http.cURL.cpp b/src/openrct2/core/Http.cURL.cpp index 8af20a3b39..2c1345508a 100644 --- a/src/openrct2/core/Http.cURL.cpp +++ b/src/openrct2/core/Http.cURL.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#if !defined(DISABLE_HTTP) && !defined(_WIN32) +#if !defined(DISABLE_HTTP) && (!defined(_WIN32) || (defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600)) # include "../Version.h" # include "../core/Console.hpp"