7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'v4' of https://github.com/geode-sdk/geode into v4
Some checks are pending
Build Binaries / Build Windows (push) Waiting to run
Details
Build Binaries / Build macOS (push) Waiting to run
Details
Build Binaries / Build Android (64-bit) (push) Waiting to run
Details
Build Binaries / Build Android (32-bit) (push) Waiting to run
Details
Build Binaries / Publish (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
HJfod 2024-11-12 01:03:37 +02:00
commit acad3d2a8d
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

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

BIN
loader/include/link/android32/libcocos2dcpp.so
View file

Binary file not shown.

BIN
loader/include/link/android64/libcocos2dcpp.so
View file

Binary file not shown.

5
loader/src/loader/LoaderImpl.cpp
View file

@ -42,6 +42,11 @@ Loader::Impl::~Impl() = default;
// Initialization // Initialization
bool Loader::Impl::isForwardCompatMode() { 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()) { if (!m_forwardCompatMode.has_value()) {
m_forwardCompatMode = !this->getGameVersion().empty() && m_forwardCompatMode = !this->getGameVersion().empty() &&
this->getGameVersion() != GEODE_STR(GEODE_GD_VERSION); this->getGameVersion() != GEODE_STR(GEODE_GD_VERSION);

1
loader/src/platform/android/LoaderImpl.cpp
View file

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