Fix standalone return types and add Geode binary cache

Author: hiimjasmine00

bindings/2.2074/Cocos2d.bro

@@ -4319,8 +4319,8 @@ void kmGLPopMatrix() = m1 0x1abad0, imac 0x1f5fe0, ios 0x16bc94;
 void kmGLMatrixMode(unsigned int) = m1 0x1aba44, imac 0x1f5f60, ios 0x16bc08;
 [[link(win, android)]]
 void kmGLLoadIdentity() = m1 0x1abafc, imac 0x1f6010, ios 0x16bcc0;
-// [[link(win, android)]] // TODO: Figure this out
-// kmMat4* const kmMat4OrthographicProjection(kmMat4*, float, float, float, float, float, float) = m1 0x1abafc, imac 0x3c1240, ios 0x3ab750;
+[[link(win, android)]]
+kmMat4* const kmMat4OrthographicProjection(kmMat4*, float, float, float, float, float, float) = m1 0x1abafc, imac 0x3c1240, ios 0x3ab750;
 [[link(win, android)]]
 void kmGLMultMatrix(const kmMat4*) = m1 0x1abb60, imac 0x1f6070, ios 0x16bd24;
 

codegen/src/SourceGen.cpp

@@ -150,7 +150,7 @@ auto {class_name}::{function_name}({parameters}){const} -> decltype({function_na
 )GEN";
 
 	constexpr char const* declare_standalone = R"GEN(
-auto {function_name}({parameters}) -> decltype({function_name}({arguments})) {{
+{return} {function_name}({parameters}) {{
 	using FunctionType = decltype({function_name}({arguments}))(*)({parameter_types});
 	static auto func = wrapFunction({address_inline}, tulip::hook::WrapperMetadata{{
 		.m_convention = geode::hook::createConvention(tulip::hook::TulipConvention::{convention}),
@@ -182,6 +182,7 @@ std::string generateBindingSource(Root const& root, bool skipPugixml) {
         }
 
 		output += fmt::format(format_strings::declare_standalone,
+			fmt::arg("return", f.prototype.ret.name),
 			fmt::arg("convention", codegen::getModifyConventionName(f)),
 			fmt::arg("function_name", f.prototype.name),
 			fmt::arg("address_inline", codegen::getAddressString(f)),

test/members/CMakeLists.txt

@@ -112,32 +112,47 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android32")
 	)
 endif()
 
+message(STATUS "Fetching Geode nightly Git hash")
+
 execute_process(
 	COMMAND git ls-remote https://github.com/geode-sdk/geode -t nightly
 	WORKING_DIRECTORY $ENV{GEODE_SDK}
 	OUTPUT_VARIABLE GEODE_MEMBER_TEST_GIT_OUTPUT
+	ERROR_VARIABLE GEODE_MEMBER_TEST_GIT_ERROR
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-string(REGEX MATCH "^[0-9a-f]+" GEODE_MEMBER_TEST_GIT_HASH ${GEODE_MEMBER_TEST_GIT_OUTPUT})
-string(SUBSTRING ${GEODE_MEMBER_TEST_GIT_HASH} 0 7 GEODE_MEMBER_TEST_GIT_HASH)
-
-message(STATUS "Downloading Geode binaries from ${GEODE_MEMBER_TEST_GIT_HASH}")
-file(DOWNLOAD
-	https://github.com/geode-sdk/geode/releases/download/nightly/geode-${GEODE_MEMBER_TEST_GIT_HASH}-${GEODE_MEMBER_TEST_PLATFORM}.zip
-	${CMAKE_CURRENT_BINARY_DIR}/geode.zip
-	STATUS GEODE_MEMBER_TEST_DOWNLOAD_STATUS
-)
-list(GET GEODE_MEMBER_TEST_DOWNLOAD_STATUS 0 GEODE_MEMBER_TEST_DOWNLOAD_STATUS_CODE)
-if (GEODE_MEMBER_TEST_DOWNLOAD_STATUS_CODE EQUAL 0)
-	message(STATUS "Downloaded Geode binaries")
+if (GEODE_MEMBER_TEST_GIT_ERROR)
+	message(STATUS "Failed to fetch Geode nightly Git hash, using existing binaries")
 else()
-	list(GET GEODE_MEMBER_TEST_DOWNLOAD_STATUS 1 GEODE_MEMBER_TEST_DOWNLOAD_STATUS_MESSAGE)
-	message(FATAL_ERROR "Downloading Geode binaries failed: ${GEODE_MEMBER_TEST_DOWNLOAD_STATUS_MESSAGE}")
+	string(REGEX MATCH "^[0-9a-f]+" GEODE_MEMBER_TEST_GIT_HASH ${GEODE_MEMBER_TEST_GIT_OUTPUT})
+	string(SUBSTRING ${GEODE_MEMBER_TEST_GIT_HASH} 0 7 GEODE_MEMBER_TEST_GIT_HASH)
+
+	if ("$CACHE{GEODE_MEMBER_TEST_GIT_HASH}" STREQUAL "${GEODE_MEMBER_TEST_GIT_HASH}")
+		message(STATUS "Using cached Geode binaries from ${GEODE_MEMBER_TEST_GIT_HASH}")
+	else()
+		message(STATUS "Downloading Geode binaries from ${GEODE_MEMBER_TEST_GIT_HASH}")
+
+		file(DOWNLOAD
+			https://github.com/geode-sdk/geode/releases/download/nightly/geode-${GEODE_MEMBER_TEST_GIT_HASH}-${GEODE_MEMBER_TEST_PLATFORM}.zip
+			${CMAKE_CURRENT_BINARY_DIR}/geode.zip
+			STATUS GEODE_MEMBER_TEST_DOWNLOAD_STATUS
+		)
+		list(GET GEODE_MEMBER_TEST_DOWNLOAD_STATUS 0 GEODE_MEMBER_TEST_DOWNLOAD_STATUS_CODE)
+		if (GEODE_MEMBER_TEST_DOWNLOAD_STATUS_CODE EQUAL 0)
+			message(STATUS "Downloaded Geode binaries")
+		else()
+			list(GET GEODE_MEMBER_TEST_DOWNLOAD_STATUS 1 GEODE_MEMBER_TEST_DOWNLOAD_STATUS_MESSAGE)
+			message(FATAL_ERROR "Downloading Geode binaries failed: ${GEODE_MEMBER_TEST_DOWNLOAD_STATUS_MESSAGE}")
+		endif()
+
+		set(GEODE_MEMBER_TEST_GIT_HASH ${GEODE_MEMBER_TEST_GIT_HASH} CACHE STRING "Git hash of the Geode binaries")
+
+		file(ARCHIVE_EXTRACT
+			INPUT ${CMAKE_CURRENT_BINARY_DIR}/geode.zip
+			DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/geode
+			PATTERNS ${GEODE_MEMBER_TEST_BINARY}
+		)
+	endif()
 endif()
 
-file(ARCHIVE_EXTRACT
-	INPUT ${CMAKE_CURRENT_BINARY_DIR}/geode.zip
-	DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/geode
-	PATTERNS ${GEODE_MEMBER_TEST_BINARY}
-)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/geode/${GEODE_MEMBER_TEST_BINARY})