evil modules

Author: BlueWitherer

CMakeLists.txt

@@ -1,17 +1,28 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.26)
+
 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)
-add_library(${PROJECT_NAME} SHARED ${SOURCES})
+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}
+)
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/include)
 
@@ -25,6 +36,8 @@ 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
-        Option(
+        inline Option(
             std::string id,
             std::string name,
             std::string description,

src/main.cpp

@@ -1,8 +1,5 @@
 #include <Utils.hpp>
 
-#include <menu/OptionMenuButton.hpp>
-#include <menu/SettingV3.hpp>
-
 #include <ranges>
 
 #include <Geode/modify/PlayLayer.hpp>
@@ -11,6 +8,9 @@
 
 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_game(Loaded) {
+$on_mod(Loaded) {
     (void)horribleMod->registerCustomSettingType("menu", &HorribleSettingV3::parse);
 
     if (auto fb = OptionMenuButton::get()) OverlayManager::get()->addChild(fb);

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

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

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

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

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

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

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

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

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

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

src/menu/src/OptionCategoryItem.cpp

@@ -1,11 +1,14 @@
-#include "../OptionCategoryItem.hpp"
+module;
 
-#include <Geode/Geode.hpp>
 #include <Utils.hpp>
 
+#include <Geode/Geode.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 @@
-#include "../OptionItem.hpp"
+module;
 
 #include <Utils.hpp>
 
@@ -7,6 +7,8 @@
 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