7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-24 03:39:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of github.com:geode-sdk/geode into new-index-but-better

Browse source
This commit is contained in:
matcool 2024-04-28 16:29:07 -03:00
commit 60ca65fb67
3 changed files with 12 additions and 5 deletions

4
CMakeLists.txt
View file

@ -210,7 +210,7 @@ if (ANDROID)
endif()
set(MAT_JSON_AS_INTERFACE ON)
CPMAddPackage("gh:geode-sdk/json#28f157b")
CPMAddPackage("gh:geode-sdk/json#3fe4752")
CPMAddPackage("gh:fmtlib/fmt#10.1.1")
CPMAddPackage("gh:gulrak/filesystem#3e5b930")
@ -241,7 +241,7 @@ if (DEFINED GEODE_TULIPHOOK_REPO_PATH)
message(STATUS "Using ${GEODE_TULIPHOOK_REPO_PATH} for TulipHook")
add_subdirectory(${GEODE_TULIPHOOK_REPO_PATH} ${GEODE_TULIPHOOK_REPO_PATH}/build)
else()
CPMAddPackage("gh:geode-sdk/TulipHook#7fa328b")
CPMAddPackage("gh:geode-sdk/TulipHook#ada6508")
endif()
set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE)

5
loader/src/hooks/FMODFix.cpp
View file

@ -1,5 +1,8 @@
#include <Geode/Geode.hpp>
// uncomment whenever macos stops complaining about fmod link errors
#ifndef GEODE_IS_MACOS
using namespace geode::prelude;
auto g_systemInitialized = false;
@ -63,3 +66,5 @@ struct AndroidFMODFix : Modify<AndroidFMODFix, FMODAudioEngine> {
}
};
*/
#endif

8
loader/src/hooks/WindowsFontCacheFix.cpp
View file

@ -2,6 +2,8 @@
#ifdef GEODE_IS_WINDOWS
#include <loader/LoaderImpl.hpp>
using namespace geode::prelude;
// https://github.com/cocos2d/cocos2d-x/blob/5a25fe75cb8b26b61b14b070e757ec3b17ff7791/cocos2dx/platform/win32/CCImage.cpp#L96
@ -33,14 +35,14 @@ static void patchCall(uintptr_t addr, uintptr_t newCall) {
}
$execute {
if (LoaderImpl::get()->isForwardCompatMode()) return;
// BitmapDC::~BitmapDC
patchCall(0xC9A56, (uintptr_t)&RemoveFontResourceWHook);
// BitmapDC::setFont
patchCall(0xCB5BC, (uintptr_t)&RemoveFontResourceWHook);
patchCall(0xCB642, (uintptr_t)&AddFontResourceWHook);
};
#endif
#endif