Merge branch 'main' into new-index-but-better

2024-11-22 23:48:08 -05:00 · 2024-03-02 18:39:58 +02:00 · 2024-03-02 18:39:58 +02:00 · 0a17fcc985
commit 0a17fcc985
parent f365dc4861 dd440433db
9 changed files with 4 additions and 2 deletions
--- a/cmake/Platform.cmake
+++ b/cmake/Platform.cmake
@ -76,9 +76,10 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android32")

 	target_link_libraries(${PROJECT_NAME} INTERFACE
 		c
-		${GEODE_LOADER_PATH}/include/link/android32/libcurl.a
 		${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/libcurl.a
 		${GEODE_LOADER_PATH}/include/link/android32/libcocos2dcpp.so
 		${GEODE_LOADER_PATH}/include/link/android32/libfmod.so
 		GLESv2
@ -95,9 +96,10 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android64")

 	target_link_libraries(${PROJECT_NAME} INTERFACE
 		c
-		${GEODE_LOADER_PATH}/include/link/android64/libcurl.a
 		${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/libcurl.a
 		${GEODE_LOADER_PATH}/include/link/android64/libcocos2dcpp.so
 		${GEODE_LOADER_PATH}/include/link/android64/libfmod.so
 		GLESv2
--- a/loader/include/link/android32/libcrypto.a
+++ b/loader/include/link/android32/libcrypto.a
--- a/loader/include/link/android32/libcurl.a
+++ b/loader/include/link/android32/libcurl.a
--- a/loader/include/link/android32/libnghttp2.a
+++ b/loader/include/link/android32/libnghttp2.a
--- a/loader/include/link/android32/libssl.a
+++ b/loader/include/link/android32/libssl.a
--- a/loader/include/link/android64/libcrypto.a
+++ b/loader/include/link/android64/libcrypto.a
--- a/loader/include/link/android64/libcurl.a
+++ b/loader/include/link/android64/libcurl.a
--- a/loader/include/link/android64/libnghttp2.a
+++ b/loader/include/link/android64/libnghttp2.a
--- a/loader/include/link/android64/libssl.a
+++ b/loader/include/link/android64/libssl.a