Skip to content

Commit 665a000

Browse files
committed
update net libs, use system certificates on windows (i hope it works)
1 parent 138d071 commit 665a000

File tree

11 files changed

+13
-14
lines changed

11 files changed

+13
-14
lines changed

cmake/Platform.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Win64")
115115
)
116116
else()
117117
target_link_libraries(${PROJECT_NAME} INTERFACE
118-
${GEODE_LOADER_PATH}/include/link/win64/ssl.lib
119-
${GEODE_LOADER_PATH}/include/link/win64/crypto.lib
120118
${GEODE_LOADER_PATH}/include/link/win64/nghttp2.lib
121-
${GEODE_LOADER_PATH}/include/link/win64/ngtcp2.lib
122-
${GEODE_LOADER_PATH}/include/link/win64/nghttp3.lib
123-
${GEODE_LOADER_PATH}/include/link/win64/ngtcp2_crypto_boringssl.lib
124119
${GEODE_LOADER_PATH}/include/link/win64/libcurl.lib
125120
)
126121
endif()

loader/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ endif()
185185
# CA Bundle
186186
CPMAddPackage(
187187
GITHUB_REPOSITORY geode-sdk/net_libs
188-
GIT_TAG 1f5ffb3
188+
GIT_TAG 6abd76c
189189
# CPM is bugged and will not allow an empty string.
190190
# https://github.com/cpm-cmake/CPM.cmake/issues/467
191191
# https://github.com/cpm-cmake/CPM.cmake/issues/461

loader/include/Geode/utils/web.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ namespace geode::utils::web {
232232
/**
233233
* Sets the Certificate Authority (CA) bundle content.
234234
* Defaults to sending the Geode CA bundle, found here: https://github.com/geode-sdk/net_libs/blob/main/ca_bundle.h
235+
* On Windows, defaults to using the system certificate store.
235236
*
236237
* @param content
237238
* @return WebRequest&
-4.85 MB
Binary file not shown.

loader/include/link/win64/libcurl.lib

100755100644
628 Bytes
Binary file not shown.

loader/include/link/win64/nghttp2.lib

100755100644
-2.33 KB
Binary file not shown.
-515 KB
Binary file not shown.
-1.04 MB
Binary file not shown.
-74.9 KB
Binary file not shown.

loader/include/link/win64/ssl.lib

-2.59 MB
Binary file not shown.

0 commit comments

Comments
 (0)