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

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

Browse source
This commit is contained in:
HJfod 2023-12-23 16:35:17 +02:00
commit f187c6f433
6 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmake/Platform.cmake
View file

@ -96,8 +96,8 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android32")
log
)
set(GEODE_OUTPUT_NAME "Geode.v7")
set(GEODE_PLATFORM_BINARY "Geode.v7.so")
set(GEODE_OUTPUT_NAME "Geode.armeabi-v7a")
set(GEODE_PLATFORM_BINARY "Geode.armeabi-v7a.so")
elseif (GEODE_TARGET_PLATFORM STREQUAL "Android64")
set_target_properties(${PROJECT_NAME} PROPERTIES
@ -105,15 +105,15 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Android64")
)
target_link_libraries(${PROJECT_NAME} INTERFACE
${GEODE_LOADER_PATH}/include/link/android64/libcurl.a
${GEODE_LOADER_PATH}/include/link/android64/libssl.a
${GEODE_LOADER_PATH}/include/link/android64/libcrypto.a
# ${GEODE_LOADER_PATH}/include/link/android64/libcurl.a
# ${GEODE_LOADER_PATH}/include/link/android64/libssl.a
# ${GEODE_LOADER_PATH}/include/link/android64/libcrypto.a
${GEODE_LOADER_PATH}/include/link/android64/libcocos2dcpp.so
log
)
set(GEODE_OUTPUT_NAME "Geode.v8")
set(GEODE_PLATFORM_BINARY "Geode.v8.so")
set(GEODE_OUTPUT_NAME "Geode.arm64-v8a")
set(GEODE_PLATFORM_BINARY "Geode.arm64-v8a.so")
else()
message(FATAL_ERROR "Unknown platform ${GEODE_TARGET_PLATFORM}")
endif()

2
loader/include/Geode/cocos/touch_dispatcher/CCTouchDispatcher.h vendored
View file

@ -236,8 +236,8 @@ protected:
// 2.2 changes
CC_SYNTHESIZE_NV(int, m_forcePrio, ForcePrio);
void* m_unknown;
CC_SYNTHESIZE_NV(int, m_targetPrio, TargetPrio);
int m_inversePrio;
};
// end of input group

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

Binary file not shown.

0
loader/test/members/Android.cpp → loader/test/members/Android32.cpp
View file

38
loader/test/members/Android64.cpp Normal file
View file

@ -0,0 +1,38 @@
#include "Common.hpp"
#ifdef GEODE_IS_ANDROID64
using namespace geode::prelude;
GEODE_SIZE_CHECK(CCObject, 0x38);
GEODE_SIZE_CHECK(CCNode, 0x140);
GEODE_SIZE_CHECK(CCNodeRGBA, 0x158);
GEODE_SIZE_CHECK(CCLayer, 0x198);
GEODE_SIZE_CHECK(CCLayerColor, 0x220);
GEODE_SIZE_CHECK(CCSprite, 0x258);
GEODE_SIZE_CHECK(CCMenu, 0x1b8);
GEODE_SIZE_CHECK(CCMenuItem, 0x178);
GEODE_SIZE_CHECK(CCMenuItemSprite, 0x190);
GEODE_SIZE_CHECK(CCScale9Sprite, 0x208);
GEODE_SIZE_CHECK(FLAlertLayer, 0x278);
GEODE_SIZE_CHECK(BoomListView, 0x1d0);
GEODE_SIZE_CHECK(CustomListView, 0x1d8);
GEODE_SIZE_CHECK(CCMenuItemSpriteExtra, 0x1d8);
GEODE_SIZE_CHECK(LoadingLayer, 0x1c8);
GEODE_SIZE_CHECK(GJDropDownLayer, 0x268);
GEODE_SIZE_CHECK(TableViewCell, 0x218);
GEODE_SIZE_CHECK(Slider, 0x1c8);
GEODE_SIZE_CHECK(SliderTouchLogic, 0x1e0);
GEODE_SIZE_CHECK(CCScrollLayerExt, 0x200);
GEODE_SIZE_CHECK(TableView, 0x290);
GEODE_SIZE_CHECK(CCTextInputNode, 0x238);
GEODE_SIZE_CHECK(CCTouchDispatcher, 0x90);
GEODE_MEMBER_CHECK(TableViewCell, m_mainLayer, 0x208);
GEODE_MEMBER_CHECK(TableView, m_cellDelegate, 0x268);
GEODE_MEMBER_CHECK(CCTextInputNode, m_textField, 0x1f8);
#endif

2
loader/test/members/CMakeLists.txt
View file

@ -4,7 +4,7 @@ set(PROJECT_NAME TestMembers)
project(${PROJECT_NAME} VERSION 1.0.0)
add_library(${PROJECT_NAME} SHARED MacOS.cpp Windows.cpp Android.cpp)
add_library(${PROJECT_NAME} SHARED MacOS.cpp Windows.cpp Android32.cpp Android64.cpp)
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
target_include_directories(${PROJECT_NAME} PRIVATE