mirror of
https://github.com/geode-sdk/geode.git
synced 2024-11-14 11:05:08 -05:00
Merge branch 'v4' of https://github.com/geode-sdk/geode into v4
Some checks are pending
Build Binaries / Build Windows (push) Waiting to run
Build Binaries / Build macOS (push) Waiting to run
Build Binaries / Build Android (64-bit) (push) Waiting to run
Build Binaries / Build Android (32-bit) (push) Waiting to run
Build Binaries / Publish (push) Blocked by required conditions
Some checks are pending
Build Binaries / Build Windows (push) Waiting to run
Build Binaries / Build macOS (push) Waiting to run
Build Binaries / Build Android (64-bit) (push) Waiting to run
Build Binaries / Build Android (32-bit) (push) Waiting to run
Build Binaries / Publish (push) Blocked by required conditions
This commit is contained in:
commit
acad3d2a8d
5 changed files with 10 additions and 7 deletions
|
@ -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(
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue