another push of fix hoping it succeeds this time (lmao)

Author: Chimed2

CMakeLists.txt

@@ -1,64 +1,79 @@
 cmake_minimum_required(VERSION 3.21)
 
-# Set C++ standard to 20 for compatibility with Geode's {fmt}
+# Standard C++20 for compatibility with modern Geode and {fmt}
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-if (Python3_ROOT_DIR)
-    set(Python3_FIND_STRATEGY LOCATION)
-endif()
+# --- Python Discovery ---
+# We need to find the Python development headers and libraries. 
+# On mobile (Android/iOS), we often rely on prebuilt versions.
 
 if (ANDROID)
-    if (NOT DEFINED PREBUILT_PYTHON_PATH)
-        if (Python3_ROOT_DIR)
-            set(PREBUILT_PYTHON_PATH ${Python3_ROOT_DIR})
-        else()
-            message(WARNING "PREBUILT_PYTHON_PATH and Python3_ROOT_DIR not set for Android!")
-        endif()
+    message(STATUS "Configuring Python for Android...")
+    
+    # I literally spent all of yesterday fighting with Android's find_library.
+    # Why is it so inconsistent with the NDK? If this pathing logic 
+    # ever breaks again, I'm quitting.
+    if (NOT DEFINED PREBUILT_PYTHON_PATH AND Python3_ROOT_DIR)
+        set(PREBUILT_PYTHON_PATH ${Python3_ROOT_DIR})
     endif()
 
     if (PREBUILT_PYTHON_PATH)
+        message(STATUS "Using prebuilt Python from: ${PREBUILT_PYTHON_PATH}")
         add_library(Python3_Mobile INTERFACE)
-        target_include_directories(Python3_Mobile INTERFACE ${PREBUILT_PYTHON_PATH}/include)
+        target_include_directories(Python3_Mobile INTERFACE "${PREBUILT_PYTHON_PATH}/include")
 
-        find_library(PYTHON_LIB python3.11 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
+        # We try to find the specific library version
+        find_library(PYTHON_LIB NAMES python3.11 python3 PATHS "${PREBUILT_PYTHON_PATH}/lib" NO_DEFAULT_PATH)
         if (NOT PYTHON_LIB)
-            find_library(PYTHON_LIB python3 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
+            message(FATAL_ERROR "Could not find Python library in ${PREBUILT_PYTHON_PATH}/lib")
         endif()
-        target_link_libraries(Python3_Mobile INTERFACE ${PYTHON_LIB})
 
+        target_link_libraries(Python3_Mobile INTERFACE ${PYTHON_LIB})
         set(PYTHON_TARGET Python3_Mobile)
     else()
-        message(STATUS "Python Runtime will attempt to find Python despite no PREBUILT_PYTHON_PATH provided.")
+        message(WARNING "Neither PREBUILT_PYTHON_PATH nor Python3_ROOT_DIR is set for Android. Build might fail.")
         find_package(Python3 REQUIRED COMPONENTS Development.Embed)
         set(PYTHON_TARGET Python3::Python)
     endif()
 else()
+    # On desktop platforms, standard discovery is usually fine.
     find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Embed)
     set(PYTHON_TARGET Python3::Python)
+    message(STATUS "Found Python: ${Python3_VERSION} at ${Python3_EXECUTABLE}")
 endif()
 
+# --- Project Setup ---
 project(PythonRuntime VERSION 1.0.0)
 
+# Automatically pick up any .cpp files in the src/ directory
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp)
+
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
 
-# Use plain linking to match Geode's internal style
+# --- Linking & Includes ---
 target_link_libraries(${PROJECT_NAME} ${PYTHON_TARGET})
 
-if (NOT ANDROID)
-    target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
-endif()
-
+# Ensure we have access to our own public headers
 target_include_directories(${PROJECT_NAME} INTERFACE include)
+
+# This define is used in PythonRuntime.hpp to handle DLL exports
 target_compile_definitions(${PROJECT_NAME} PRIVATE PYTHON_RUNTIME_EXPORT)
 
+# Desktop-specific includes if find_package was used
+if (NOT ANDROID AND Python3_INCLUDE_DIRS)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
+endif()
+
+# --- Geode Integration ---
+# Geode is required for this mod to function.
 if (NOT DEFINED ENV{GEODE_SDK})
-    message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
+    message(FATAL_ERROR "GEODE_SDK environment variable is not set! Please point it to your Geode SDK directory.")
 endif()
 
+message(STATUS "Geode SDK found at: $ENV{GEODE_SDK}")
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
+# Finalize the Geode mod setup
 setup_geode_mod(${PROJECT_NAME} VERSION 4.0.0)

include/PythonRuntime.hpp

@@ -4,6 +4,10 @@
 #include <string>
 #include <filesystem>
 
+/**
+ * DLL Export/Import macros for Windows.
+ * This allows other mods to potentially use the PythonRuntime class if they link against it.
+ */
 #ifdef GEODE_IS_WINDOWS
     #ifdef PYTHON_RUNTIME_EXPORT
         #define PYTHON_API __declspec(dllexport)
@@ -14,30 +18,44 @@
     #define PYTHON_API [[gnu::visibility("default")]]
 #endif
 
+/**
+ * The main interface for interacting with the Python environment within Geode.
+ * This class handles initialization, dependency management, and script execution.
+ */
 class PYTHON_API PythonRuntime {
 public:
     /**
-     * @brief Initialize the Python environment for a specific mod.
+     * Scans a mod for Python-related content (main.py, requirements.txt, etc.)
+     * and sets up the environment for that specific mod.
+     * @param mod The mod to initialize.
      */
     static void initializeForMod(geode::Mod* mod);
 
     /**
-     * @brief Run a python string in the context of a mod.
+     * Executes a raw string of Python code.
+     * @param code The Python source code to run.
+     * @param mod Optional mod context (currently unused but reserved for future scoped execution).
      */
     static void runString(std::string const& code, geode::Mod* mod = nullptr);
 
     /**
-     * @brief Run a python file in the context of a mod.
+     * Loads and executes a Python script from the filesystem.
+     * @param path Path to the .py file.
+     * @param mod Optional mod context.
      */
     static void runFile(std::filesystem::path const& path, geode::Mod* mod = nullptr);
 
     /**
-     * @brief Setup the security sandbox.
+     * Configures the Python audit hooks and basic security restrictions.
+     * This is called once during the initial startup of the runtime.
      */
     static void setupSandbox();
 
     /**
-     * @brief Check and install dependencies for a mod.
+     * Checks for dependency files (.env or requirements.txt) and attempts
+     * to install them into the mod's 'site-packages' directory using pip.
+     * Note: This is a no-op on mobile platforms.
+     * @param mod The mod to check dependencies for.
      */
     static void ensureDependencies(geode::Mod* mod);
 };