revert modules

Author: BlueWitherer

CMakeLists.txt

@@ -1,28 +1,17 @@
-cmake_minimum_required(VERSION 3.26)
-
+cmake_minimum_required(VERSION 3.21)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
     set(CMAKE_OSX_ARCHITECTURES "arm64")
 else()
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif()
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 project(HorribleIdeas VERSION 1.0.0)
 
-set(CMAKE_CXX_SCAN_FOR_MODULES ON)
-
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp)
-file(GLOB_RECURSE MODULES CONFIGURE_DEPENDS src/*.cppm)
-
-add_library(${PROJECT_NAME} SHARED)
-
-target_sources(${PROJECT_NAME}
-    PRIVATE ${SOURCES}
-    PUBLIC FILE_SET cxx_modules TYPE CXX_MODULES FILES ${MODULES}
-)
+add_library(${PROJECT_NAME} SHARED ${SOURCES})
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/include)
 
@@ -36,8 +25,6 @@ else()
     message(STATUS "Found Geode: $ENV{GEODE_SDK}")
 endif()
 
-set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
-set(CMAKE_CXX_SCAN_FOR_MODULES ON)
 
 setup_geode_mod(${PROJECT_NAME})

include/Option.hpp

@@ -28,7 +28,7 @@ namespace horrible {
         Option() = default;  // Default constructor
 
         // Constructor
-        inline Option(
+        Option(
             std::string id,
             std::string name,
             std::string description,

src/main.cpp

@@ -1,5 +1,8 @@
 #include <Utils.hpp>
 
+#include <menu/OptionMenuButton.hpp>
+#include <menu/SettingV3.hpp>
+
 #include <ranges>
 
 #include <Geode/modify/PlayLayer.hpp>
@@ -8,9 +11,6 @@
 
 using namespace horrible::prelude;
 
-import OptionMenuButton;
-import SettingV3;
-
 inline static std::vector<Hook*> safeModeHooks;
 inline static std::vector<Hook*> floatingBtnHooks;
 
@@ -41,7 +41,7 @@ inline static std::vector<Hook*> floatingBtnHooks;
         };                                                                      \
     }
 
-$on_mod(Loaded) {
+$on_game(Loaded) {
     (void)horribleMod->registerCustomSettingType("menu", &HorribleSettingV3::parse);
 
     if (auto fb = OptionMenuButton::get()) OverlayManager::get()->addChild(fb);

src/menu/OptionCategoryItem.cppm src/menu/OptionCategoryItem.hppsrc/menu/OptionCategoryItem.cppm renamed to src/menu/OptionCategoryItem.hpp

@@ -1,17 +1,15 @@
-module;
+#pragma once
 
 #include <Geode/Geode.hpp>
 
 using namespace geode::prelude;
 
-export module OptionCategoryItem;
-
 // Event for option toggles
-export struct CategoryEvent final : Event<CategoryEvent, bool(std::string_view, bool)> {
+struct CategoryEvent final : Event<CategoryEvent, bool(std::string_view, bool)> {
     using Event::Event;
 };
 
-export class OptionCategoryItem final : public CCMenu {
+class OptionCategoryItem final : public CCMenu {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;

src/menu/OptionItem.cppm src/menu/OptionItem.hppsrc/menu/OptionItem.cppm renamed to src/menu/OptionItem.hpp

@@ -1,4 +1,4 @@
-module;
+#pragma once
 
 #include <Utils.hpp>
 
@@ -7,14 +7,12 @@ module;
 using namespace geode::prelude;
 using namespace horrible;
 
-export module OptionItem;
-
 // Event for pin toggles
-export struct PinEvent final : Event<PinEvent, bool()> {
+struct PinEvent final : Event<PinEvent, bool()> {
     using Event::Event;
 };
 
-export class OptionItem final : public CCMenu {
+class OptionItem final : public CCMenu {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;

src/menu/OptionMenu.cppm src/menu/OptionMenu.hppsrc/menu/OptionMenu.cppm renamed to src/menu/OptionMenu.hpp

@@ -1,4 +1,6 @@
-module;
+#pragma once
+
+#include "OptionCategoryItem.hpp"
 
 #include <Utils.hpp>
 
@@ -7,9 +9,7 @@ module;
 using namespace geode::prelude;
 using namespace horrible;
 
-export module OptionMenu;
-
-export class OptionMenu final : public Popup {
+class OptionMenu final : public Popup {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;

src/menu/OptionMenuButton.cppm src/menu/OptionMenuButton.hppsrc/menu/OptionMenuButton.cppm renamed to src/menu/OptionMenuButton.hpp

@@ -1,12 +1,10 @@
-module;
+#pragma once
 
 #include <Geode/Geode.hpp>
 
 using namespace geode::prelude;
 
-export module OptionMenuButton;
-
-export class OptionMenuButton final : public CCLayer {
+class OptionMenuButton final : public CCLayer {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;

src/menu/SettingV3.cppm src/menu/SettingV3.hppsrc/menu/SettingV3.cppm renamed to src/menu/SettingV3.hpp

@@ -1,14 +1,12 @@
-module;
+#pragma once
 
 #include <Geode/Geode.hpp>
 
 #include <Geode/loader/SettingV3.hpp>
 
 using namespace geode::prelude;
 
-export module SettingV3;
-
-export class HorribleSettingV3 final : public SettingV3 {
+class HorribleSettingV3 final : public SettingV3 {
 public:
     static Result<std::shared_ptr<SettingV3>> parse(
         std::string key,
@@ -25,7 +23,7 @@ export class HorribleSettingV3 final : public SettingV3 {
     SettingNodeV3* createNode(float width) override;
 };
 
-export class HorribleSettingNodeV3 final : public SettingNodeV3 {
+class HorribleSettingNodeV3 final : public SettingNodeV3 {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;

src/menu/src/OptionCategoryItem.cpp

@@ -1,14 +1,11 @@
-module;
-
-#include <Utils.hpp>
+#include "../OptionCategoryItem.hpp"
 
 #include <Geode/Geode.hpp>
+#include <Utils.hpp>
 
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
-module OptionCategoryItem;
-
 class OptionCategoryItem::Impl final {
 public:
     std::string category = "";  // The category name

src/menu/src/OptionItem.cpp

@@ -1,4 +1,4 @@
-module;
+#include "../OptionItem.hpp"
 
 #include <Utils.hpp>
 
@@ -7,8 +7,6 @@ module;
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
-module OptionItem;
-
 class OptionItem::Impl final {
 public:
     bool compatible = false;  // If this option is compatible with the current platform