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

fully works on macos

Browse source
This commit is contained in:
altalk23 2022-10-04 17:26:20 +03:00
parent d9a1fae5b0
commit b4c8d0f65a
6 changed files with 14 additions and 4 deletions
bindings
GeometryDash.bro
cmake
Platform.cmake
codegen/src
SourceGen.cpp
loader
include/Geode/cocos/extensions/GUI/CCControlExtension
CCControlColourPicker.h
resources
about.md
src/utils/mac
util.mm

2
bindings/GeometryDash.bro
View file

@ -4907,7 +4907,7 @@ class Slider : cocos2d::CCLayer {
this->m_sliderBar->setVisible(v);
}
static Slider* create(cocos2d::CCNode* target, cocos2d::SEL_MenuHandler click, float scale) {
return create(target, click, nullptr, "slidergroove.png", "sliderthumb.png", "sliderthumbsel.png", scale);
return create(target, click, "sliderBar.png", "slidergroove.png", "sliderthumb.png", "sliderthumbsel.png", scale);
}
float getValue() = mac 0x18e0c0, win 0x2e970, ios 0x0;

2
cmake/Platform.cmake
View file

@ -40,7 +40,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS")
)
target_link_libraries(${PROJECT_NAME} INTERFACE curl "-framework Cocoa")
target_compile_options(${PROJECT_NAME} INTERFACE -fms-extensions -Wno-deprecated -Wno-ignored-attributes -Os -flto -fvisibility=internal)
target_compile_options(${PROJECT_NAME} INTERFACE -fms-extensions -Wno-deprecated -Wno-ignored-attributes -Os #[[-flto]] -fvisibility=internal)
target_compile_definitions(${PROJECT_NAME} INTERFACE -DCC_TARGET_OS_MAC)
set(GEODE_PLATFORM_BINARY "Geode.dylib")

3
codegen/src/SourceGen.cpp
View file

@ -84,6 +84,9 @@ std::string generateGDSource(Root& root) {
output += i->inner + "\n";
}
} else if (auto fn = f.get_as<OutOfLineField>()) {
if (codegen::getStatus(f) != BindStatus::Unbindable)
continue;
switch (fn->beginning.type) {
case FunctionType::Ctor:
case FunctionType::Dtor:

3
loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlColourPicker.h
View file

@ -63,6 +63,9 @@ public:
virtual ~CCControlColourPicker();
protected:
RT_ADD(
ccColor3B m_rgb;
)
HSV m_hsv;
CC_SYNTHESIZE_RETAIN(CCControlSaturationBrightnessPicker*, m_colourPicker, colourPicker)

4
loader/resources/about.md
View file

@ -38,4 +38,8 @@ Using
* [fmt](https://fmt.dev/latest/index.html)
* [PEGTL](https://github.com/taocpp/PEGTL)
* [md4c](https://github.com/mity/md4c)
Special thanks to [RobTop Games](https://twitter.com/RobTopGames/) for making this amazing game and providing us and so many others with hours of entertainment <3

4
loader/src/utils/mac/util.mm
View file

@ -72,14 +72,14 @@ Result<ghc::filesystem::path> utils::file::pickFile(
file::PickMode mode,
file::FilePickOptions const& options
) {
throw std::runtime_error("utils::file::pickFile is not implemented");
return Err("utils::file::pickFile is not implemented");
// return [FileDialog importDocumentWithMode:mode options:options];
}
Result<std::vector<ghc::filesystem::path>> utils::file::pickFiles(
file::FilePickOptions const& options
) {
throw std::runtime_error("utils::file::pickFiles is not implemented");
return Err("utils::file::pickFiles is not implemented");
// return [FileDialog importDocumentWithOptions:options];
}