* update ca_bundle & curl libs

* use rustls, c-ares and zstd for curl
* use zlib from curl builds for minizip
* this was tested on windows and android64

Author: dankmeme01

cmake/Platform.cmake

@@ -32,10 +32,12 @@ if (GEODE_TARGET_PLATFORM STREQUAL "iOS")
 		"-framework Foundation"   # needed for many things
 		"-framework AVFoundation" # needed for microphone access
 		"-framework CoreGraphics" # needed for image saving
-		${GEODE_LOADER_PATH}/include/link/ios/libssl.a
-		${GEODE_LOADER_PATH}/include/link/ios/libcrypto.a
-		${GEODE_LOADER_PATH}/include/link/ios/libnghttp2.a
+		${GEODE_LOADER_PATH}/include/link/ios/libcares.a
 		${GEODE_LOADER_PATH}/include/link/ios/libcurl.a
+		${GEODE_LOADER_PATH}/include/link/ios/libnghttp2.a
+		${GEODE_LOADER_PATH}/include/link/ios/librustls.a
+		${GEODE_LOADER_PATH}/include/link/ios/libz.a
+		${GEODE_LOADER_PATH}/include/link/ios/libzstd.a
 	)
 
 	target_compile_definitions(${PROJECT_NAME} INTERFACE
@@ -71,13 +73,12 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS")
 		"-framework OpenGL"
 		"-framework SystemConfiguration"
 		${GEODE_LOADER_PATH}/include/link/macos/libfmod.dylib
-		${GEODE_LOADER_PATH}/include/link/macos/libssl.a
-		${GEODE_LOADER_PATH}/include/link/macos/libcrypto.a
-		${GEODE_LOADER_PATH}/include/link/macos/libnghttp2.a
-		${GEODE_LOADER_PATH}/include/link/macos/libngtcp2.a
-		${GEODE_LOADER_PATH}/include/link/macos/libnghttp3.a
-		${GEODE_LOADER_PATH}/include/link/macos/libngtcp2_crypto_boringssl.a
+		${GEODE_LOADER_PATH}/include/link/macos/libcares.a
 		${GEODE_LOADER_PATH}/include/link/macos/libcurl.a
+		${GEODE_LOADER_PATH}/include/link/macos/libnghttp2.a
+		${GEODE_LOADER_PATH}/include/link/macos/librustls.a
+		${GEODE_LOADER_PATH}/include/link/macos/libz.a
+		${GEODE_LOADER_PATH}/include/link/macos/libzstd.a
 	)
 
 	target_compile_definitions(${PROJECT_NAME} INTERFACE
@@ -116,8 +117,15 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Win64")
 		)
 	else()
 		target_link_libraries(${PROJECT_NAME} INTERFACE
-			${GEODE_LOADER_PATH}/include/link/win64/nghttp2.lib
+			${GEODE_LOADER_PATH}/include/link/win64/cares.lib
 			${GEODE_LOADER_PATH}/include/link/win64/libcurl.lib
+			${GEODE_LOADER_PATH}/include/link/win64/nghttp2.lib
+			${GEODE_LOADER_PATH}/include/link/win64/rustls.lib
+			${GEODE_LOADER_PATH}/include/link/win64/zs.lib
+			${GEODE_LOADER_PATH}/include/link/win64/zstd_static.lib
+			secur32
+			ntdll
+			userenv
 		)
 	endif()
 
@@ -139,13 +147,12 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android32")
 	target_link_libraries(${PROJECT_NAME} INTERFACE
 		c
 		unwind
-		${GEODE_LOADER_PATH}/include/link/android32/libssl.a
-		${GEODE_LOADER_PATH}/include/link/android32/libcrypto.a
-		${GEODE_LOADER_PATH}/include/link/android32/libnghttp2.a
-		${GEODE_LOADER_PATH}/include/link/android32/libngtcp2.a
-		${GEODE_LOADER_PATH}/include/link/android32/libnghttp3.a
-		${GEODE_LOADER_PATH}/include/link/android32/libngtcp2_crypto_boringssl.a
+		${GEODE_LOADER_PATH}/include/link/android32/libcares.a
 		${GEODE_LOADER_PATH}/include/link/android32/libcurl.a
+		${GEODE_LOADER_PATH}/include/link/android32/libnghttp2.a
+		${GEODE_LOADER_PATH}/include/link/android32/librustls.a
+		${GEODE_LOADER_PATH}/include/link/android32/libz.a
+		${GEODE_LOADER_PATH}/include/link/android32/libzstd.a
 		${GEODE_LOADER_PATH}/include/link/android32/libcocos2dcpp.so
 		${GEODE_LOADER_PATH}/include/link/android32/libfmod.so
 		GLESv2
@@ -169,13 +176,12 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android64")
 	target_link_libraries(${PROJECT_NAME} INTERFACE
 		c
 		unwind
-		${GEODE_LOADER_PATH}/include/link/android64/libssl.a
-		${GEODE_LOADER_PATH}/include/link/android64/libcrypto.a
-		${GEODE_LOADER_PATH}/include/link/android64/libnghttp2.a
-		${GEODE_LOADER_PATH}/include/link/android64/libngtcp2.a
-		${GEODE_LOADER_PATH}/include/link/android64/libnghttp3.a
-		${GEODE_LOADER_PATH}/include/link/android64/libngtcp2_crypto_boringssl.a
+		${GEODE_LOADER_PATH}/include/link/android64/libcares.a
 		${GEODE_LOADER_PATH}/include/link/android64/libcurl.a
+		${GEODE_LOADER_PATH}/include/link/android64/libnghttp2.a
+		${GEODE_LOADER_PATH}/include/link/android64/librustls.a
+		${GEODE_LOADER_PATH}/include/link/android64/libz.a
+		${GEODE_LOADER_PATH}/include/link/android64/libzstd.a
 		${GEODE_LOADER_PATH}/include/link/android64/libcocos2dcpp.so
 		${GEODE_LOADER_PATH}/include/link/android64/libfmod.so
 		GLESv2

loader/CMakeLists.txt

@@ -18,12 +18,6 @@ else()
 	set(PROJECT_VERSION_SUFFIX "" CACHE INTERNAL "" )
 endif()
 
-# I think CMake is trying to link zlib from the host system?
-# This prevents it from doing that.
-if (WIN32 AND CMAKE_CROSSCOMPILING)
-	set(MZ_FORCE_FETCH_LIBS ON)
-endif()
-
 # https://stackoverflow.com/a/63924044/9124836
 # https://stackoverflow.com/a/72396471
 execute_process(
@@ -187,15 +181,7 @@ if (GEODE_NO_UNDEFINED_VIRTUALS)
 endif()
 
 # CA Bundle
-CPMAddPackage(
-	GITHUB_REPOSITORY geode-sdk/net_libs
-	GIT_TAG 6abd76c
-# CPM is bugged and will not allow an empty string.
-# https://github.com/cpm-cmake/CPM.cmake/issues/467
-# https://github.com/cpm-cmake/CPM.cmake/issues/461
-	GIT_SUBMODULES "nghttp3"
-	GIT_SUBMODULES_RECURSE OFF
-)
+CPMAddPackage("gh:geode-sdk/net_libs#b5b810c")
 target_link_libraries(${PROJECT_NAME} ca-bundle)
 
 # Package resources for UI
@@ -260,12 +246,17 @@ if (NOT GEODE_BUILDING_DOCS)
 	set(MZ_OPENSSL OFF CACHE INTERNAL "")
 	set(MZ_LIBBSD OFF CACHE INTERNAL "")
 	set(MZ_FETCH_LIBS ON CACHE INTERNAL "" FORCE)
-	set(MZ_FORCE_FETCH_LIBS ${WIN32} CACHE INTERNAL "")
 	set(SKIP_INSTALL_ALL ON CACHE INTERNAL "")
-	CPMAddPackage("gh:geode-sdk/minizip-ng#43d9254")
+	set(ZLIB_INCLUDE_DIR "${GEODE_LOADER_PATH}/src/zlib")
+	set(MZ_FORCE_FETCH_LIBS OFF CACHE INTERNAL "" FORCE)
 	if (WIN32)
-		set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+		set(ZLIB_LIBRARY "${GEODE_LOADER_PATH}/include/link/win64/zs.lib")
+	else()
+		string(TOLOWER ${GEODE_TARGET_PLATFORM} _libs_folder)
+		set(ZLIB_LIBRARY "${GEODE_LOADER_PATH}/include/link/${_libs_folder}/libz.a")
 	endif()
+	
+	CPMAddPackage("gh:geode-sdk/minizip-ng#e9dda96")
 
 	# Silence warnings from dependencies
 	include(CheckCXXCompilerFlag)
@@ -297,11 +288,6 @@ endif()
 
 target_link_libraries(${PROJECT_NAME} TulipHook geode-sdk mat-json-impl)
 
-# Required by curl for macos
-if (APPLE)
-	target_link_libraries(${PROJECT_NAME} z)
-endif()
-
 # always use unity builds for some dependencies
 if (TARGET md4c)
 	set_target_properties(md4c PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 64)