From 070474dd18322888933a88291f3a0345eb17ecfc Mon Sep 17 00:00:00 2001 From: altalk23 Date: Thu, 13 Oct 2022 14:00:41 +0300 Subject: [PATCH] some header fixings and more compile time improvements --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 10 +++++----- README.md | 4 ++-- codegen/src/BindingGen.cpp | 2 +- codegen/src/Main.cpp | 2 +- loader/CMakeLists.txt | 1 + loader/include/Geode/Bindings.hpp | 2 +- loader/include/Geode/Modify.hpp | 2 +- loader/include/Geode/modify/Addresses.hpp | 2 +- loader/include/Geode/modify/Comparer.hpp | 2 +- loader/include/Geode/modify/Types.hpp | 2 +- loader/include/Geode/modify/Wrapper.hpp | 2 +- loader/include/Geode/ui/BasedButton.hpp | 2 +- loader/include/Geode/ui/ColorPickPopup.hpp | 2 +- loader/include/Geode/ui/ListView.hpp | 4 ++-- loader/include/Geode/ui/MDTextArea.hpp | 2 +- loader/include/Geode/ui/Popup.hpp | 4 ++-- loader/include/Geode/ui/ScrollLayer.hpp | 4 ++-- loader/include/Geode/ui/SelectList.hpp | 2 +- loader/src/hooks/GeodeNodeMetadata.cpp | 2 +- loader/src/hooks/LoadingLayer.cpp | 2 +- loader/src/hooks/MenuLayer.cpp | 2 +- loader/src/hooks/TouchDispatcherFix.cpp | 2 +- loader/src/hooks/handler_fixes.cpp | 10 +++++----- loader/src/hooks/persist.cpp | 2 +- loader/src/hooks/save.cpp | 2 +- loader/src/hooks/update.cpp | 2 +- loader/src/hooks/updateResources.cpp | 4 ++-- loader/src/ui/internal/dev/HookListLayer.cpp | 2 +- loader/src/ui/internal/dev/HookListLayer.hpp | 2 +- loader/src/ui/internal/dev/HookListView.cpp | 4 ++-- loader/src/ui/internal/dev/HookListView.hpp | 4 ++-- loader/src/ui/internal/info/ModInfoLayer.cpp | 12 ++++++------ loader/src/ui/internal/info/ModInfoLayer.hpp | 4 ++-- loader/src/ui/internal/list/ModListLayer.cpp | 16 ++++++++-------- loader/src/ui/internal/list/ModListLayer.hpp | 2 +- loader/src/ui/internal/list/ModListView.cpp | 6 +++--- loader/src/ui/internal/list/ModListView.hpp | 6 +++--- .../src/ui/internal/list/SearchFilterPopup.cpp | 2 +- .../ui/internal/settings/GeodeSettingNode.cpp | 8 ++++---- .../ui/internal/settings/GeodeSettingNode.hpp | 8 ++++---- .../ui/internal/settings/ModSettingsPopup.cpp | 2 +- loader/src/ui/nodes/ColorPickPopup.cpp | 8 ++++---- loader/src/ui/nodes/InputNode.cpp | 2 +- loader/src/ui/nodes/ListView.cpp | 4 ++-- loader/src/ui/nodes/MDPopup.cpp | 2 +- loader/src/ui/nodes/MDTextArea.cpp | 2 +- loader/src/ui/nodes/Notification.cpp | 2 +- loader/test/dependency/main.cpp | 2 +- loader/test/main/main.cpp | 2 +- 50 files changed, 92 insertions(+), 91 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0381100a..c00e3b5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: - name: "macOS" os: macos-latest prefixes: 'PATH="/usr/local/opt/ccache/libexec:$PATH"' - extra_flags: "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON" + extra_flags: "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" out_paths: './bin/nightly/Geode.dylib ./bin/nightly/GeodeBootstrapper.dylib' name: ${{ matrix.config.name }} runs-on: ${{ matrix.config.os }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 34ab887a..758fc08b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,21 +39,21 @@ add_custom_target(CodegenRun ALL COMMAND Codegen ${GEODE_TARGET_PLATFORM} bindings ${GEODE_CODEGEN_PATH} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Run Codegen" - BYPRODUCTS ${GEODE_CODEGEN_PATH}/GeneratedSource.cpp + BYPRODUCTS ${GEODE_CODEGEN_PATH}/Geode/GeneratedSource.cpp ) add_dependencies(${PROJECT_NAME} CodegenRun) add_dependencies(CodegenRun Codegen) # Hacky way to supress the not generated error -if (NOT EXISTS ${GEODE_CODEGEN_PATH}/GeneratedSource.cpp) +if (NOT EXISTS ${GEODE_CODEGEN_PATH}/Geode/GeneratedSource.cpp) make_directory(${GEODE_CODEGEN_PATH}) - file(TOUCH ${GEODE_CODEGEN_PATH}/GeneratedSource.cpp) + file(TOUCH ${GEODE_CODEGEN_PATH}/Geode/GeneratedSource.cpp) endif() -target_sources(${PROJECT_NAME} INTERFACE ${GEODE_CODEGEN_PATH}/GeneratedSource.cpp) -target_include_directories(${PROJECT_NAME} INTERFACE ${GEODE_CODEGEN_PATH}/..) +target_sources(${PROJECT_NAME} INTERFACE ${GEODE_CODEGEN_PATH}/Geode/GeneratedSource.cpp) target_include_directories(${PROJECT_NAME} INTERFACE + ${GEODE_CODEGEN_PATH} ${GEODE_LOADER_PATH}/include ${GEODE_LOADER_PATH}/include/Geode/cocos/ ${GEODE_LOADER_PATH}/include/Geode/cocos/cocos2dx diff --git a/README.md b/README.md index 9b62d04c..f93f0ccf 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ There's nothing worse than having to read thousands of words just to see what some library's code actually looks like, so instead, here's a **Hello World** in Geode right off the bat: ```cpp -#include -#include +#include +#include USE_GEODE_NAMESPACE(); diff --git a/codegen/src/BindingGen.cpp b/codegen/src/BindingGen.cpp index 9faf9a1c..61c2315e 100644 --- a/codegen/src/BindingGen.cpp +++ b/codegen/src/BindingGen.cpp @@ -11,7 +11,7 @@ namespace { namespace format_strings { #include #include #include -#include +#include #include )GEN"; diff --git a/codegen/src/Main.cpp b/codegen/src/Main.cpp index 4a913649..b02392a8 100644 --- a/codegen/src/Main.cpp +++ b/codegen/src/Main.cpp @@ -16,7 +16,7 @@ int main(int argc, char** argv) try { chdir(argv[2]); - ghc::filesystem::path writeDir = argv[3]; + auto writeDir = ghc::filesystem::path(argv[3]) / "Geode"; ghc::filesystem::create_directories(writeDir); ghc::filesystem::create_directories(writeDir / "modify"); ghc::filesystem::create_directories(writeDir / "binding"); diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index f7e65a02..d019ac82 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -123,6 +123,7 @@ target_precompile_headers(${PROJECT_NAME} PRIVATE # "${CMAKE_CURRENT_SOURCE_DIR}/include/Geode/Bindings.hpp" # "${CMAKE_CURRENT_SOURCE_DIR}/include/Geode/Modify.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/include/Geode/cocos/cocos2dx/include/cocos2d.h" + "${CMAKE_CURRENT_SOURCE_DIR}/include/Geode/cocos/extensions/cocos-ext.h" ) # Create launcher diff --git a/loader/include/Geode/Bindings.hpp b/loader/include/Geode/Bindings.hpp index 2fa5a2c6..bb49da4e 100644 --- a/loader/include/Geode/Bindings.hpp +++ b/loader/include/Geode/Bindings.hpp @@ -22,4 +22,4 @@ namespace geode::core::meta {} #define CLASSPARAM(...) #define STRUCTPARAM(...) -#include +#include diff --git a/loader/include/Geode/Modify.hpp b/loader/include/Geode/Modify.hpp index 2e465f21..cba9d460 100644 --- a/loader/include/Geode/Modify.hpp +++ b/loader/include/Geode/Modify.hpp @@ -2,7 +2,7 @@ #include -#include +#include #include "modify/Field.hpp" #include "modify/InternalMacros.hpp" diff --git a/loader/include/Geode/modify/Addresses.hpp b/loader/include/Geode/modify/Addresses.hpp index 4e26af01..15ffc1be 100644 --- a/loader/include/Geode/modify/Addresses.hpp +++ b/loader/include/Geode/modify/Addresses.hpp @@ -4,6 +4,6 @@ namespace geode::modifier { struct addresses { - #include + #include }; } diff --git a/loader/include/Geode/modify/Comparer.hpp b/loader/include/Geode/modify/Comparer.hpp index 7260c2b0..3e2c98cc 100644 --- a/loader/include/Geode/modify/Comparer.hpp +++ b/loader/include/Geode/modify/Comparer.hpp @@ -26,6 +26,6 @@ namespace geode::modifier { >> { constexpr static inline bool value = true; }; - #include + #include }; } diff --git a/loader/include/Geode/modify/Types.hpp b/loader/include/Geode/modify/Types.hpp index ba5f6f2d..a4cc050c 100644 --- a/loader/include/Geode/modify/Types.hpp +++ b/loader/include/Geode/modify/Types.hpp @@ -3,6 +3,6 @@ namespace geode::modifier { struct types { - #include + #include }; } diff --git a/loader/include/Geode/modify/Wrapper.hpp b/loader/include/Geode/modify/Wrapper.hpp index 3967ec1f..88496ec5 100644 --- a/loader/include/Geode/modify/Wrapper.hpp +++ b/loader/include/Geode/modify/Wrapper.hpp @@ -68,7 +68,7 @@ namespace geode::modifier { struct wrap { GEODE_WRAPPER_FOR_IDENTIFIER(constructor) GEODE_WRAPPER_FOR_IDENTIFIER(destructor) - #include + #include }; // template class Identifier, class Base, class Derived, class ...Types> diff --git a/loader/include/Geode/ui/BasedButton.hpp b/loader/include/Geode/ui/BasedButton.hpp index 9d5bc0c5..dd32b3b5 100644 --- a/loader/include/Geode/ui/BasedButton.hpp +++ b/loader/include/Geode/ui/BasedButton.hpp @@ -1,7 +1,7 @@ #pragma once #include "BasedButtonSprite.hpp" -#include +#include #pragma warning(disable : 4275) diff --git a/loader/include/Geode/ui/ColorPickPopup.hpp b/loader/include/Geode/ui/ColorPickPopup.hpp index d0f46938..c217a6e8 100644 --- a/loader/include/Geode/ui/ColorPickPopup.hpp +++ b/loader/include/Geode/ui/ColorPickPopup.hpp @@ -1,7 +1,7 @@ #include "Popup.hpp" #include "InputNode.hpp" -#include +#include namespace geode { class ColorPickPopupDelegate { diff --git a/loader/include/Geode/ui/ListView.hpp b/loader/include/Geode/ui/ListView.hpp index ca561ff6..70aefcd5 100644 --- a/loader/include/Geode/ui/ListView.hpp +++ b/loader/include/Geode/ui/ListView.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace geode { class GEODE_DLL GenericListCell : public TableViewCell { diff --git a/loader/include/Geode/ui/MDTextArea.hpp b/loader/include/Geode/ui/MDTextArea.hpp index 3c781ed6..f0e59105 100644 --- a/loader/include/Geode/ui/MDTextArea.hpp +++ b/loader/include/Geode/ui/MDTextArea.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "TextRenderer.hpp" #include "ScrollLayer.hpp" diff --git a/loader/include/Geode/ui/Popup.hpp b/loader/include/Geode/ui/Popup.hpp index 7f93271c..18dfba72 100644 --- a/loader/include/Geode/ui/Popup.hpp +++ b/loader/include/Geode/ui/Popup.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace geode { template diff --git a/loader/include/Geode/ui/ScrollLayer.hpp b/loader/include/Geode/ui/ScrollLayer.hpp index 29d73495..0f1c925a 100644 --- a/loader/include/Geode/ui/ScrollLayer.hpp +++ b/loader/include/Geode/ui/ScrollLayer.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace geode { /** diff --git a/loader/include/Geode/ui/SelectList.hpp b/loader/include/Geode/ui/SelectList.hpp index 0cdd0865..b285fb1b 100644 --- a/loader/include/Geode/ui/SelectList.hpp +++ b/loader/include/Geode/ui/SelectList.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace geode { diff --git a/loader/src/hooks/GeodeNodeMetadata.cpp b/loader/src/hooks/GeodeNodeMetadata.cpp index e756bc74..4d74d551 100644 --- a/loader/src/hooks/GeodeNodeMetadata.cpp +++ b/loader/src/hooks/GeodeNodeMetadata.cpp @@ -59,7 +59,7 @@ public: }; // proxy forwards -#include +#include class $modify(ProxyCCNode, CCNode) { virtual CCObject* getUserObject() { return GeodeNodeMetadata::set(this)->m_userObject; diff --git a/loader/src/hooks/LoadingLayer.cpp b/loader/src/hooks/LoadingLayer.cpp index 42a80fee..142881fa 100644 --- a/loader/src/hooks/LoadingLayer.cpp +++ b/loader/src/hooks/LoadingLayer.cpp @@ -2,7 +2,7 @@ USE_GEODE_NAMESPACE(); -#include +#include class $modify(CustomLoadingLayer, LoadingLayer) { bool init(bool fromReload) { if (!LoadingLayer::init(fromReload)) diff --git a/loader/src/hooks/MenuLayer.cpp b/loader/src/hooks/MenuLayer.cpp index 06e738c5..f333d2da 100644 --- a/loader/src/hooks/MenuLayer.cpp +++ b/loader/src/hooks/MenuLayer.cpp @@ -128,7 +128,7 @@ static void updateIndexProgress( } } -#include +#include class $modify(CustomMenuLayer, MenuLayer) { void destructor() { g_geodeButton = nullptr; diff --git a/loader/src/hooks/TouchDispatcherFix.cpp b/loader/src/hooks/TouchDispatcherFix.cpp index 24c40e1c..f161097e 100644 --- a/loader/src/hooks/TouchDispatcherFix.cpp +++ b/loader/src/hooks/TouchDispatcherFix.cpp @@ -1,6 +1,6 @@ USE_GEODE_NAMESPACE(); -#include +#include class $modify(CCTouchDispatcher) { void addTargetedDelegate(CCTouchDelegate *delegate, int priority, bool swallowsTouches) { m_bForcePrio = false; diff --git a/loader/src/hooks/handler_fixes.cpp b/loader/src/hooks/handler_fixes.cpp index 6706ffc4..e5aca789 100644 --- a/loader/src/hooks/handler_fixes.cpp +++ b/loader/src/hooks/handler_fixes.cpp @@ -46,14 +46,14 @@ class $modify(CCUtility##HandlerTypeinfoFix, CCUtility##Handler) { } \ } -#include +#include HandlerFixFor(CCKeypad); -#include +#include HandlerFixFor(CCKeyboard); -#include +#include HandlerFixFor(CCMouse); -#include +#include class $modify(CCTargetedTouchHandlerTypeinfoFix, CCTargetedTouchHandler) { void destructor() { if (m_pDelegate) { @@ -100,7 +100,7 @@ class $modify(CCTargetedTouchHandlerTypeinfoFix, CCTargetedTouchHandler) { } }; -#include +#include class $modify(CCStandardTouchHandlerTypeinfoFix, CCStandardTouchHandler) { void destructor() { if (m_pDelegate) { diff --git a/loader/src/hooks/persist.cpp b/loader/src/hooks/persist.cpp index 3b1c51cd..c1290451 100644 --- a/loader/src/hooks/persist.cpp +++ b/loader/src/hooks/persist.cpp @@ -2,7 +2,7 @@ USE_GEODE_NAMESPACE(); -#include +#include class $modify(AchievementNotifier) { void willSwitchToScene(CCScene* scene) { AchievementNotifier::willSwitchToScene(scene); diff --git a/loader/src/hooks/save.cpp b/loader/src/hooks/save.cpp index 4fef91df..ec499e86 100644 --- a/loader/src/hooks/save.cpp +++ b/loader/src/hooks/save.cpp @@ -2,7 +2,7 @@ USE_GEODE_NAMESPACE(); -#include +#include class $modify(AppDelegate) { void trySaveGame() { log::log(Severity::Info, Loader::getInternalMod(), "Saving..."); diff --git a/loader/src/hooks/update.cpp b/loader/src/hooks/update.cpp index add541f5..4357224b 100644 --- a/loader/src/hooks/update.cpp +++ b/loader/src/hooks/update.cpp @@ -2,7 +2,7 @@ USE_GEODE_NAMESPACE(); -#include +#include class $modify(CCScheduler) { void update(float dt) { InternalLoader::get()->executeGDThreadQueue(); diff --git a/loader/src/hooks/updateResources.cpp b/loader/src/hooks/updateResources.cpp index e20c02d3..cb2bae95 100644 --- a/loader/src/hooks/updateResources.cpp +++ b/loader/src/hooks/updateResources.cpp @@ -2,7 +2,7 @@ USE_GEODE_NAMESPACE(); -#include +#include class $modify(GameManager) { void reloadAllStep2() { GameManager::reloadAllStep2(); @@ -10,7 +10,7 @@ class $modify(GameManager) { } }; -#include +#include class $modify(LoadingLayer) { void loadAssets() { LoadingLayer::loadAssets(); diff --git a/loader/src/ui/internal/dev/HookListLayer.cpp b/loader/src/ui/internal/dev/HookListLayer.cpp index 97c55f95..6fb8a4bf 100644 --- a/loader/src/ui/internal/dev/HookListLayer.cpp +++ b/loader/src/ui/internal/dev/HookListLayer.cpp @@ -1,5 +1,5 @@ #include "HookListLayer.hpp" -#include +#include bool HookListLayer::init(Mod* mod) { if (!GJDropDownLayer::init("Hooks", 220.f)) diff --git a/loader/src/ui/internal/dev/HookListLayer.hpp b/loader/src/ui/internal/dev/HookListLayer.hpp index 8e409c39..36f25629 100644 --- a/loader/src/ui/internal/dev/HookListLayer.hpp +++ b/loader/src/ui/internal/dev/HookListLayer.hpp @@ -1,7 +1,7 @@ #pragma once #include "HookListView.hpp" -#include +#include class HookListLayer : public GJDropDownLayer { protected: diff --git a/loader/src/ui/internal/dev/HookListView.cpp b/loader/src/ui/internal/dev/HookListView.cpp index d1768974..561c1f7c 100644 --- a/loader/src/ui/internal/dev/HookListView.cpp +++ b/loader/src/ui/internal/dev/HookListView.cpp @@ -1,6 +1,6 @@ #include "HookListView.hpp" -#include -#include +#include +#include #include HookCell::HookCell(const char* name, CCSize size) : diff --git a/loader/src/ui/internal/dev/HookListView.hpp b/loader/src/ui/internal/dev/HookListView.hpp index 56786559..cff1e4d2 100644 --- a/loader/src/ui/internal/dev/HookListView.hpp +++ b/loader/src/ui/internal/dev/HookListView.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include USE_GEODE_NAMESPACE(); diff --git a/loader/src/ui/internal/info/ModInfoLayer.cpp b/loader/src/ui/internal/info/ModInfoLayer.cpp index d746819d..d9848a94 100644 --- a/loader/src/ui/internal/info/ModInfoLayer.cpp +++ b/loader/src/ui/internal/info/ModInfoLayer.cpp @@ -8,12 +8,12 @@ #include #include "../settings/ModSettingsPopup.hpp" #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // TODO: die #undef min diff --git a/loader/src/ui/internal/info/ModInfoLayer.hpp b/loader/src/ui/internal/info/ModInfoLayer.hpp index 2c0ee93f..69de4935 100644 --- a/loader/src/ui/internal/info/ModInfoLayer.hpp +++ b/loader/src/ui/internal/info/ModInfoLayer.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/loader/src/ui/internal/list/ModListLayer.cpp b/loader/src/ui/internal/list/ModListLayer.cpp index 27d8f3f3..bc10ae7e 100644 --- a/loader/src/ui/internal/list/ModListLayer.cpp +++ b/loader/src/ui/internal/list/ModListLayer.cpp @@ -3,14 +3,14 @@ #include "SearchFilterPopup.hpp" #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include static ModListType g_tab = ModListType::Installed; diff --git a/loader/src/ui/internal/list/ModListLayer.hpp b/loader/src/ui/internal/list/ModListLayer.hpp index 52ceca25..c13331b2 100644 --- a/loader/src/ui/internal/list/ModListLayer.hpp +++ b/loader/src/ui/internal/list/ModListLayer.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "ModListView.hpp" #include diff --git a/loader/src/ui/internal/list/ModListView.cpp b/loader/src/ui/internal/list/ModListView.cpp index 284a9dc0..22172d02 100644 --- a/loader/src/ui/internal/list/ModListView.cpp +++ b/loader/src/ui/internal/list/ModListView.cpp @@ -7,9 +7,9 @@ #include "ModListLayer.hpp" #include #include "../info/CategoryNode.hpp" -#include -#include -#include +#include +#include +#include template static bool tryOrAlert(Result const& res, const char* title) { diff --git a/loader/src/ui/internal/list/ModListView.hpp b/loader/src/ui/internal/list/ModListView.hpp index 61e6468a..5e493702 100644 --- a/loader/src/ui/internal/list/ModListView.hpp +++ b/loader/src/ui/internal/list/ModListView.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/loader/src/ui/internal/list/SearchFilterPopup.cpp b/loader/src/ui/internal/list/SearchFilterPopup.cpp index 1d0ba3d2..6eace286 100644 --- a/loader/src/ui/internal/list/SearchFilterPopup.cpp +++ b/loader/src/ui/internal/list/SearchFilterPopup.cpp @@ -3,7 +3,7 @@ #include "ModListView.hpp" #include #include "../info/CategoryNode.hpp" -#include +#include bool SearchFilterPopup::setup(ModListLayer* layer, ModListType type) { m_noElasticity = true; diff --git a/loader/src/ui/internal/settings/GeodeSettingNode.cpp b/loader/src/ui/internal/settings/GeodeSettingNode.cpp index e321c730..d36687eb 100644 --- a/loader/src/ui/internal/settings/GeodeSettingNode.cpp +++ b/loader/src/ui/internal/settings/GeodeSettingNode.cpp @@ -1,9 +1,9 @@ #include "GeodeSettingNode.hpp" #include -#include -#include -#include -#include +#include +#include +#include +#include // BoolSettingNode diff --git a/loader/src/ui/internal/settings/GeodeSettingNode.hpp b/loader/src/ui/internal/settings/GeodeSettingNode.hpp index 48da2f75..3bc02696 100644 --- a/loader/src/ui/internal/settings/GeodeSettingNode.hpp +++ b/loader/src/ui/internal/settings/GeodeSettingNode.hpp @@ -2,10 +2,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/loader/src/ui/internal/settings/ModSettingsPopup.cpp b/loader/src/ui/internal/settings/ModSettingsPopup.cpp index 221ca0b3..3006ffdf 100644 --- a/loader/src/ui/internal/settings/ModSettingsPopup.cpp +++ b/loader/src/ui/internal/settings/ModSettingsPopup.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include bool ModSettingsPopup::setup(Mod* mod) { m_noElasticity = true; diff --git a/loader/src/ui/nodes/ColorPickPopup.cpp b/loader/src/ui/nodes/ColorPickPopup.cpp index 5e53ed1d..2c63375c 100644 --- a/loader/src/ui/nodes/ColorPickPopup.cpp +++ b/loader/src/ui/nodes/ColorPickPopup.cpp @@ -1,9 +1,9 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include USE_GEODE_NAMESPACE(); diff --git a/loader/src/ui/nodes/InputNode.cpp b/loader/src/ui/nodes/InputNode.cpp index 20f741e5..e8596049 100644 --- a/loader/src/ui/nodes/InputNode.cpp +++ b/loader/src/ui/nodes/InputNode.cpp @@ -1,5 +1,5 @@ #include -#include +#include USE_GEODE_NAMESPACE(); diff --git a/loader/src/ui/nodes/ListView.cpp b/loader/src/ui/nodes/ListView.cpp index 67b50b9d..183ad208 100644 --- a/loader/src/ui/nodes/ListView.cpp +++ b/loader/src/ui/nodes/ListView.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/loader/src/ui/nodes/MDPopup.cpp b/loader/src/ui/nodes/MDPopup.cpp index fb6f9954..50c8b987 100644 --- a/loader/src/ui/nodes/MDPopup.cpp +++ b/loader/src/ui/nodes/MDPopup.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include USE_GEODE_NAMESPACE(); diff --git a/loader/src/ui/nodes/MDTextArea.cpp b/loader/src/ui/nodes/MDTextArea.cpp index 552389f5..28c99d7b 100644 --- a/loader/src/ui/nodes/MDTextArea.cpp +++ b/loader/src/ui/nodes/MDTextArea.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/loader/src/ui/nodes/Notification.cpp b/loader/src/ui/nodes/Notification.cpp index 44622ea4..a14a75b2 100644 --- a/loader/src/ui/nodes/Notification.cpp +++ b/loader/src/ui/nodes/Notification.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/loader/test/dependency/main.cpp b/loader/test/dependency/main.cpp index 70a8a615..1fadbb82 100644 --- a/loader/test/dependency/main.cpp +++ b/loader/test/dependency/main.cpp @@ -2,7 +2,7 @@ USE_GEODE_NAMESPACE(); -#include +#include class $modify(MenuLayer) { void onMoreGames(CCObject*) { if (Mod::get()->getSettingValue("its-raining-after-all")) { diff --git a/loader/test/main/main.cpp b/loader/test/main/main.cpp index 835618f5..33b12350 100644 --- a/loader/test/main/main.cpp +++ b/loader/test/main/main.cpp @@ -29,7 +29,7 @@ GEODE_API bool GEODE_CALL geode_unload() { } // Modify -#include +#include class $modify(GJGarageLayerTest, GJGarageLayer) { GJGarageLayerTest() : myValue(1907) {}