Skip to content

Commit 0009ba2

Browse files
committed
Revert "deps: Update asio submodule to 1.38.0"
This reverts commit 1340941.
1 parent e58032a commit 0009ba2

4 files changed

Lines changed: 8 additions & 18 deletions

File tree

deps/asio

Submodule asio updated 2374 files

deps/cpp-httplib

Submodule cpp-httplib updated 294 files

plugins/http/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ if(OS_MACOS)
4444
endif()
4545

4646
if(MSVC)
47-
# /wd4834: discarding return value /wd4996: deprecation warnings from
48-
# httplib.h using OpenSSL APIs deprecated in 4.0
49-
target_compile_options(${PROJECT_NAME} PRIVATE /wd4834 /wd4996)
47+
target_compile_options(${PROJECT_NAME} PRIVATE /wd4834)
5048
endif()
5149

5250
target_sources(

plugins/twitch/CMakeLists.txt

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,11 @@ endif()
6262

6363
add_library(${PROJECT_NAME} MODULE)
6464
target_compile_definitions(
65-
${PROJECT_NAME}
66-
PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT=1
67-
ASIO_STANDALONE=1
68-
ASIO_HAS_OPENSSSL=1
69-
# Predefine the include guard to suppress asio's rfc2818_verification
70-
# (broken with OpenSSL 4.0) regardless of which asio version is found
71-
# first (e.g. OBS deps 1.32.0 vs 1.38.0 in in-tree builds)
72-
ASIO_SSL_RFC2818_VERIFICATION_HPP)
65+
${PROJECT_NAME} PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT=1 ASIO_STANDALONE=1
66+
ASIO_HAS_OPENSSSL=1)
7367
target_include_directories(
74-
${PROJECT_NAME} BEFORE PUBLIC "${ADVSS_SOURCE_DIR}/deps/asio/asio/include"
75-
"${ADVSS_SOURCE_DIR}/deps/websocketpp")
68+
${PROJECT_NAME} PUBLIC "${ADVSS_SOURCE_DIR}/deps/asio/asio/include"
69+
"${ADVSS_SOURCE_DIR}/deps/websocketpp")
7670
if(OS_MACOS)
7771
target_compile_definitions(
7872
${PROJECT_NAME} PRIVATE CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN=1)
@@ -81,9 +75,7 @@ if(OS_MACOS)
8175
endif()
8276

8377
if(MSVC)
84-
# /wd4834: discarding return value /wd4996: deprecation warnings from
85-
# httplib.h using OpenSSL APIs deprecated in 4.0
86-
target_compile_options(${PROJECT_NAME} PRIVATE /wd4834 /wd4996)
78+
target_compile_options(${PROJECT_NAME} PRIVATE /wd4834)
8779
endif()
8880

8981
target_sources(

0 commit comments

Comments
 (0)