Merge branch 'v4' of https://github.com/geode-sdk/geode into v4

CMakeLists.txt

@@ -189,13 +189,10 @@ include(cmake/Platform.cmake)
 include(cmake/GeodeFile.cmake)
 
 if (NOT DEFINED GEODE_GD_VERSION)
-	if (GEODE_TARGET_PLATFORM STREQUAL "Win64" OR GEODE_TARGET_PLATFORM STREQUAL "MacOS")
-		set(GEODE_GD_VERSION 2.2073)
-		set(GEODE_COMP_GD_VERSION 22073)
-	else()
-		set(GEODE_GD_VERSION 2.206)
-		set(GEODE_COMP_GD_VERSION 22060)
-	endif()
+	# this is incorrect!
+	# Android and iOS are on 2.2074 so please fix when 2.2074 releases for desktop :(
+	set(GEODE_GD_VERSION 2.2073)
+	set(GEODE_COMP_GD_VERSION 22073)
 endif()
 
 target_compile_definitions(

loader/src/loader/LoaderImpl.cpp

@@ -42,6 +42,11 @@ Loader::Impl::~Impl() = default;
 // Initialization
 
 bool Loader::Impl::isForwardCompatMode() {
+#ifdef GEODE_IS_ANDROID
+    // forward compat mode doesn't really make sense on android
+    return false;
+#endif
+
     if (!m_forwardCompatMode.has_value()) {
         m_forwardCompatMode = !this->getGameVersion().empty() &&
             this->getGameVersion() != GEODE_STR(GEODE_GD_VERSION);

loader/src/platform/android/LoaderImpl.cpp

@@ -21,6 +21,7 @@ std::string Loader::Impl::getGameVersion() {
             case 37: m_gdVersion = "2.200"; break;
             case 38: m_gdVersion = "2.205"; break;
             case 39: m_gdVersion = "2.206"; break;
+            case 40: m_gdVersion = "2.2074"; break;
             default: m_gdVersion = std::to_string(version_code);
         }
     }