From 16acd7ec2790e08f8157a3391756d84f86ba1489 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 18:23:44 -0400
Subject: [PATCH 01/15] refactor yippe

---
 CMakeLists.txt                     |   2 +-
 Makefile                           |  14 +-
 src/{desktop => }/backends/glfw2.c |   2 +-
 src/{desktop => }/backends/glfw3.c |   2 +-
 src/{desktop => }/backends/sdl1.c  |   2 +-
 src/{desktop => }/backends/sdl2.c  |   2 +-
 src/{desktop => }/backends/sdl3.c  |   2 +-
 src/cli/main.c                     | 498 ++++++++++++++++++++++
 src/{desktop => cli}/stb_impl.c    |   0
 src/{desktop/main.c => loop.c}     | 640 +----------------------------
 src/loop.h                         | 104 +++++
 src/{desktop => }/platformdefs.h   |   0
 12 files changed, 619 insertions(+), 649 deletions(-)
 rename src/{desktop => }/backends/glfw2.c (99%)
 rename src/{desktop => }/backends/glfw3.c (99%)
 rename src/{desktop => }/backends/sdl1.c (99%)
 rename src/{desktop => }/backends/sdl2.c (99%)
 rename src/{desktop => }/backends/sdl3.c (99%)
 create mode 100644 src/cli/main.c
 rename src/{desktop => cli}/stb_impl.c (100%)
 rename src/{desktop/main.c => loop.c} (67%)
 create mode 100644 src/loop.h
 rename src/{desktop => }/platformdefs.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e344daea5..e4994dad0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -323,7 +323,7 @@ if(PLATFORM STREQUAL "desktop")
         set(BACKEND_LIBRARIES ${SDL3_LIBRARIES})
     endif()
     target_link_libraries(butterscotch PRIVATE ${BACKEND_LIBRARIES} ${AUDIO_LIBRARIES} ${PLATFORM_LIBRARIES})
-    target_sources(butterscotch PRIVATE src/desktop/backends/${DESKTOP_BACKEND}.c)
+    target_sources(butterscotch PRIVATE src/backends/${BACKEND}.c)
 
     # Enable AddressSanitizer by default in Debug builds
     if(CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/Makefile b/Makefile
index c270d0e51..4f195d39c 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ INCLUDES += $(INCLUDE). \
 HEADERS += $(wildcard src/*.h) $(shell find vendor -name '*.h')
 SRCS += $(wildcard src/*.c) $(wildcard src/image/*.c) $(wildcard vendor/bzip2/*.c) vendor/md5/md5.c vendor/sha1/sha1.c vendor/base64/base64.c
 
-DESKTOP_BACKEND := glfw3
+BACKEND := glfw3
 AUDIO_BACKEND := miniaudio
 
 ifdef BUTTERSCOTCH_COMMIT_DATE
@@ -70,34 +70,34 @@ DEFINES += $(DEFINE)ENABLE_WAD17
 endif
 
 # TODO: add support for non-desktop backends
-SRCS += $(wildcard src/desktop/*.c) src/desktop/backends/$(DESKTOP_BACKEND).c
+SRCS += $(wildcard src/desktop/*.c) src/backends/$(BACKEND).c
 ifeq ($(OS),Windows)
 PKG_CONFIG_FLAGS := --static
 endif
 INCLUDES += $(INCLUDE)src/desktop
-ifeq ($(DESKTOP_BACKEND),glfw3)
+ifeq ($(BACKEND),glfw3)
 GLFW3_LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs glfw3)
 LIBS += $(GLFW3_LIBS)
 DEFINES += $(DEFINE)USE_GLFW3
 ENABLE_GLAD := 1
 endif
-ifeq ($(DESKTOP_BACKEND),glfw2)
+ifeq ($(BACKEND),glfw2)
 GLFW2_LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs libglfw)
 LIBS += $(GLFW2_LIBS)
 DEFINES += $(DEFINE)USE_GLFW2
 ENABLE_GLAD := 1
 endif
-ifeq ($(DESKTOP_BACKEND),sdl1)
+ifeq ($(BACKEND),sdl1)
 SDL1_LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs sdl)
 LIBS += $(SDL1_LIBS)
 DEFINES += $(DEFINE)USE_SDL1
 endif
-ifeq ($(DESKTOP_BACKEND),sdl2)
+ifeq ($(BACKEND),sdl2)
 SDL2_LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs sdl2)
 LIBS += $(SDL2_LIBS)
 DEFINES += $(DEFINE)USE_SDL2
 endif
-ifeq ($(DESKTOP_BACKEND),sdl3)
+ifeq ($(BACKEND),sdl3)
 SDL3_LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs sdl3)
 LIBS += $(SDL3_LIBS)
 DEFINES += $(DEFINE)USE_SDL3
diff --git a/src/desktop/backends/glfw2.c b/src/backends/glfw2.c
similarity index 99%
rename from src/desktop/backends/glfw2.c
rename to src/backends/glfw2.c
index 0a3001089..3f07ef37e 100644
--- a/src/desktop/backends/glfw2.c
+++ b/src/backends/glfw2.c
@@ -12,7 +12,7 @@
 
 #include "common.h"
 #include "input_recording.h"
-#include "desktop/platformdefs.h"
+#include "platformdefs.h"
 #include "gettime.h"
 #include "runner_mouse.h"
 
diff --git a/src/desktop/backends/glfw3.c b/src/backends/glfw3.c
similarity index 99%
rename from src/desktop/backends/glfw3.c
rename to src/backends/glfw3.c
index 6abfccf1a..23af551ee 100644
--- a/src/desktop/backends/glfw3.c
+++ b/src/backends/glfw3.c
@@ -14,7 +14,7 @@
 
 #include "common.h"
 #include "input_recording.h"
-#include "desktop/platformdefs.h"
+#include "platformdefs.h"
 #include "gettime.h"
 #include "runner_mouse.h"
 
diff --git a/src/desktop/backends/sdl1.c b/src/backends/sdl1.c
similarity index 99%
rename from src/desktop/backends/sdl1.c
rename to src/backends/sdl1.c
index e1917d80c..cc65997c0 100644
--- a/src/desktop/backends/sdl1.c
+++ b/src/backends/sdl1.c
@@ -8,7 +8,7 @@
 
 #include "common.h"
 #include "input_recording.h"
-#include "desktop/platformdefs.h"
+#include "platformdefs.h"
 #include "gettime.h"
 
 #ifndef SDL_BUTTON_WHEELUP
diff --git a/src/desktop/backends/sdl2.c b/src/backends/sdl2.c
similarity index 99%
rename from src/desktop/backends/sdl2.c
rename to src/backends/sdl2.c
index 7b13a7294..da31683bb 100644
--- a/src/desktop/backends/sdl2.c
+++ b/src/backends/sdl2.c
@@ -5,7 +5,7 @@
 
 #include "common.h"
 #include "input_recording.h"
-#include "desktop/platformdefs.h"
+#include "platformdefs.h"
 #include "gettime.h"
 #include "runner_mouse.h"
 
diff --git a/src/desktop/backends/sdl3.c b/src/backends/sdl3.c
similarity index 99%
rename from src/desktop/backends/sdl3.c
rename to src/backends/sdl3.c
index 4c3c8c237..7c9f6bee2 100644
--- a/src/desktop/backends/sdl3.c
+++ b/src/backends/sdl3.c
@@ -5,7 +5,7 @@
 
 #include "common.h"
 #include "input_recording.h"
-#include "desktop/platformdefs.h"
+#include "platformdefs.h"
 #include "gettime.h"
 #include <ctype.h>
 #include "runner_mouse.h"
diff --git a/src/cli/main.c b/src/cli/main.c
new file mode 100644
index 000000000..402083558
--- /dev/null
+++ b/src/cli/main.c
@@ -0,0 +1,498 @@
+#include <loop.h>
+#include <getopt.h>
+
+/* For SDL_main */
+#if defined(USE_SDL1)
+#include <SDL/SDL_main.h>
+#elif defined(USE_SDL2)
+#include <SDL2/SDL_main.h>
+#elif defined(USE_SDL3)
+#include <SDL3/SDL_main.h>
+#endif
+
+static bool parseOsTypeArg(const char* s, YoYoOperatingSystem* out) {
+    forEach(const OsTypeNameEntry, entry, OS_TYPE_NAMES, OS_TYPE_NAMES_COUNT) {
+        if (strcmp(s, entry->name) == 0) {
+            *out = entry->value;
+            return true;
+        }
+    }
+    return false;
+}
+
+static void printOsTypeNames(FILE* out) {
+    forEachIndexed(const OsTypeNameEntry, entry, i, OS_TYPE_NAMES, OS_TYPE_NAMES_COUNT) {
+        fprintf(out, "%s%s", i > 0 ? ", " : "", entry->name);
+    }
+}
+
+static void printUsage(const char *argv0) {
+    fprintf(
+        stderr,
+        "Usage: %s <path to data.win or game.unx>\n"
+        "    --help                                 - Show this message\n"
+        "    --screenshot <filename>                - Specify the filename for screenshots\n"
+        "    --screenshot-at-frame <frame>          - Take a screenshot at the specified frame\n"
+        "    --screenshot-surfaces <filename>       - Take a screenshot of all surfaces at the specified frame\n"
+        "    --screenshot-surfaces-at-frame <frame> - Specify the filename for surface screenshots\n"
+#ifndef USE_GLFW2
+        "    --headless                             - Launch without a window\n"
+#endif
+        "    --print-rooms                          - Print all rooms in the game and exit\n"
+        "    --print-objects                        - Print all objects in the game and exit\n"
+        "    --print-shaders                        - Print all shaders in the game and exit\n"
+        "    --print-declared-functions             - Print all declared functions in the game and exit\n"
+        "    --print-unknown-functions              - Print all unknown functions used by the game and exit\n"
+        "    --trace-variable-reads                 - Trace variable reads\n"
+        "    --trace-variable-writes                - Trace variable writes\n"
+        "    --trace-function-calls                 - Trace function calls\n"
+        "    --trace-alarms                         - Trace alarms\n"
+        "    --trace-instance-lifecycles            - Trace instance creations and deletions\n"
+        "    --trace-events                         - Trace events\n"
+        "    --trace-collisions                     - Trace collisions between instances\n"
+        "    --trace-event-inherited                - Trace event inherited calls\n"
+        "    --trace-tiles                          - Trace drawn tiles\n"
+        "    --trace-opcodes                        - Trace opcodes\n"
+        "    --trace-stack                          - Trace stack\n"
+        "    --trace-frames                         - Log frametimes\n"
+        "    --always-log-unknown-functions         - Always log unknown function calls instead of once per script\n"
+        "    --always-log-stubbed-functions         - Always log stubbed function calls instead of once per script\n"
+        "    --exit-at-frame <frame>                - Exit at the specified frame\n"
+        "    --trace-bytecode-after-frame <frame>   - Delay stack and opcode tracing until the specified frame\n"
+        "    --dump-frame <frame>                   - Dump the runner state at the specified frame\n"
+        "    --dump-frame-json <frame>              - Dump the runner state in json at the specified frame\n"
+        "    --dump-frame-json-file <file>          - Specify an output file for runner state dumps\n"
+        "    --speed <speed>                        - Set a normal speed multiplier\n"
+        "    --fast-forward-speed <speed>           - Set a fast-forward speed multiplier\n"
+        "    --seed <seed>                          - Seed for the random number generator\n"
+        "    --debug                                - Enable debug mode\n"
+        "    --disassemble <script>                 - Disassemble the specified script and print to console (* disassembles all)\n"
+        "    --record-inputs <file>                 - Record all keyboard inputs to a file\n"
+        "    --playback-inputs <file>               - Playback input from file\n"
+        "    --renderer <renderer>                  - Set the rendering API\n"
+        "    --lazy-rooms                           - Lazily load rooms, increases load times but reduces memory usage\n"
+        "    --eager-room <rooms>                   - When --lazy-rooms is set, keep these rooms always in memory\n"
+        "    --os-type <os>                         - Set the reported OS type\n"
+        "    --window-size <dimentions>             - Set a custom window size\n"
+        "    --widescreen-hack <aspect ratio>       - Set a custom aspect ratio\n"
+        "    --profile-gml-scripts                  - Log which GML scripts are the heaviest in terms of time and executed instructions\n"
+        "    --save-folder <directory>              - Set the directory will save files will be stored\n"
+        "    --game-args <args>                     - Arguments to pass to the game\n"
+        "    --lazy-textures                        - Load textures into VRAM on first use, improving startup times\n"
+        "    --lazy-audio                           - Load audio into RAM on first use, reducing memory usage\n"
+        "    --load-type <type>                     - Specify how data.win is loaded, per-chunk or all at once\n"
+#ifdef EABLE_VM_OPCODE_PROFILER
+        "    --profile-opcodes                      - Rank which GML opcodes were executed the most\n"
+#endif
+        , argv0
+    );
+}
+
+static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[]) {
+    memset(args, 0, sizeof(CommandLineArgs));
+
+    static struct option longOptions[] = {
+        {"help",          no_argument, nullptr, 'H'},
+        {"screenshot",          required_argument, nullptr, 's'},
+        {"screenshot-at-frame", required_argument, nullptr, 'f'},
+        {"screenshot-surfaces", required_argument, nullptr, 'U'},
+        {"screenshot-surfaces-at-frame", required_argument, nullptr, 'V'},
+        {"headless",            no_argument,       nullptr, 'h'},
+        {"print-rooms", no_argument,               nullptr, 'r'},
+        {"print-objects", no_argument,             nullptr, 'b'},
+        {"print-shaders", no_argument,               nullptr, 998},
+        {"print-declared-functions", no_argument,  nullptr, 'p'},
+        {"print-unknown-functions", no_argument, nullptr, 'u'},
+        {"trace-variable-reads", required_argument,  nullptr, 'R'},
+        {"trace-variable-writes", required_argument, nullptr, 'W'},
+        {"trace-function-calls", required_argument,         nullptr, 'c'},
+        {"trace-alarms", required_argument,         nullptr, 'a'},
+        {"trace-instance-lifecycles", required_argument,         nullptr, 'l'},
+        {"trace-events", required_argument,         nullptr, 'e'},
+        {"trace-collisions", required_argument,     nullptr, 'C'},
+        {"trace-event-inherited", no_argument, nullptr, 'E'},
+        {"trace-tiles", required_argument, nullptr, 'T'},
+        {"trace-opcodes", required_argument,       nullptr, 'o'},
+        {"trace-stack", required_argument,         nullptr, 'S'},
+        {"trace-frames", no_argument, nullptr, 'k'},
+        {"always-log-unknown-functions", no_argument, nullptr, 'y'},
+        {"always-log-stubbed-functions", no_argument, nullptr, 'Y'},
+        {"exit-at-frame", required_argument, nullptr, 'x'},
+        {"trace-bytecode-after-frame", required_argument, nullptr, 'F'},
+        {"dump-frame", required_argument, nullptr, 'd'},
+        {"dump-frame-json", required_argument, nullptr, 'j'},
+        {"dump-frame-json-file", required_argument, nullptr, 'J'},
+        {"speed", required_argument, nullptr, 'M'},
+        {"fast-forward-speed", required_argument, nullptr, 'X'},
+        {"seed", required_argument, nullptr, 'Z'},
+        {"debug", no_argument, nullptr, 'D'},
+        {"disassemble", required_argument, nullptr, 'A'},
+        {"record-inputs", required_argument, nullptr, 'I'},
+        {"playback-inputs", required_argument, nullptr, 'P'},
+        {"renderer", required_argument, nullptr, 'g'},
+        {"lazy-rooms", no_argument, nullptr, 'z'},
+        {"eager-room", required_argument, nullptr, 'G'},
+        {"os-type", required_argument, nullptr, 'O'},
+        {"window-size", required_argument, nullptr, 'w'},
+        {"widescreen-hack", optional_argument, nullptr, 1000},
+        {"profile-gml-scripts", required_argument, nullptr, 'q'},
+        {"save-folder", required_argument, nullptr, 'B'},
+        {"game-args", required_argument, nullptr, 'N'},
+        {"lazy-textures", no_argument, nullptr, 'L'},
+        {"lazy-audio", no_argument, nullptr, 'K'},
+        {"load-type", required_argument, nullptr, 999},
+#ifdef ENABLE_VM_OPCODE_PROFILER
+        {"profile-opcodes", no_argument, nullptr, 'Q'},
+#endif
+        {nullptr,               0,                 nullptr,  0 }
+    };
+
+    args->screenshotFrames = nullptr;
+    args->exitAtFrame = -1;
+    args->traceBytecodeAfterFrame = 0;
+    args->speedMultiplier = 1.0;
+    args->fastForwardSpeed = 0.0;
+    args->osType = OS_WINDOWS;
+    args->profilerFramesBetween = 0;
+    args->loadType = DATAWINLOADTYPE_LOAD_IN_MEMORY_AHEAD_OF_TIME;
+    // TODO: detect available driver features
+    // at runtime to improve defaults.
+#if defined(ENABLE_MODERN_GL)
+    args->renderer = "modern-gl";
+#elif defined(ENABLE_LEGACY_GL)
+    args->renderer = "legacy-gl";
+#else
+    args->renderer = "software";
+#endif
+
+    int opt;
+    while ((opt = getopt_long(argc, argv, "", longOptions, nullptr)) != -1) {
+        switch (opt) {
+            case 'H':
+                printUsage(argv[0]);
+                exit(0);
+            case 's':
+                args->screenshotPattern = optarg;
+                break;
+            case 'f': {
+                char* endPtr;
+                int frame = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0' || 0 > frame) {
+                    fprintf(stderr, "Error: Invalid frame number '%s'\n", optarg);
+                    exit(1);
+                }
+
+                hmput(args->screenshotFrames, frame, true);
+                break;
+            }
+            case 'U':
+                args->screenshotSurfacesPattern = optarg;
+                break;
+            case 'V': {
+                char* endPtr;
+                int frame = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0' || 0 > frame) {
+                    fprintf(stderr, "Error: Invalid frame number '%s' for --screenshot-surfaces-at-frame\n", optarg);
+                    exit(1);
+                }
+                hmput(args->screenshotSurfacesFrames, frame, true);
+                break;
+            }
+            case 'h':
+                args->headless = true;
+                break;
+            case 'r':
+                args->printRooms = true;
+                break;
+            case 'b':
+                args->printObjects = true;
+                break;
+            case 998: {
+                args->printShaders = true;
+                break;
+            }
+            case 'p':
+                args->printDeclaredFunctions = true;
+                break;
+            case 'u':
+                args->printUnknownFunctions = true;
+                break;
+            case 'R':
+                shput(args->varReadsToBeTraced, optarg, true);
+                break;
+            case 'W':
+                shput(args->varWritesToBeTraced, optarg, true);
+                break;
+            case 'c':
+                shput(args->functionCallsToBeTraced, optarg, true);
+                break;
+            case 'a':
+                shput(args->alarmsToBeTraced, optarg, true);
+                break;
+            case 'l':
+                shput(args->instanceLifecyclesToBeTraced, optarg, true);
+                break;
+            case 'L':
+                args->lazyTextures = true;
+                break;
+            case 'K':
+                args->lazyAudio = true;
+                break;
+            case 'e':
+                shput(args->eventsToBeTraced, optarg, true);
+                break;
+            case 'C':
+                shput(args->collisionsToBeTraced, optarg, true);
+                break;
+            case 'o':
+                shput(args->opcodesToBeTraced, optarg, true);
+                break;
+            case 'S':
+                shput(args->stackToBeTraced, optarg, true);
+                break;
+            case 'k':
+                args->traceFrames = true;
+                break;
+            case 'y':
+                args->alwaysLogUnknownFunctions = true;
+                break;
+            case 'Y':
+                args->alwaysLogStubbedFunctions = true;
+                break;
+            case 'x': {
+                char* endPtr;
+                int frame = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0' || 0 > frame) {
+                    fprintf(stderr, "Error: Invalid frame number '%s' for --exit-at-frame\n", optarg);
+                    exit(1);
+                }
+                args->exitAtFrame = frame;
+                break;
+            }
+            case 'F': {
+                char* endPtr;
+                int frame = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0' || 0 > frame) {
+                    fprintf(stderr, "Error: Invalid frame number '%s' for --trace-bytecode-after-frame\n", optarg);
+                    exit(1);
+                }
+                args->traceBytecodeAfterFrame = frame;
+                break;
+            }
+            case 'd': {
+                char* endPtr;
+                int frame = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0' || 0 > frame) {
+                    fprintf(stderr, "Error: Invalid frame number '%s' for --dump-frame\n", optarg);
+                    exit(1);
+                }
+                hmput(args->dumpFrames, frame, true);
+                break;
+            }
+            case 'j': {
+                char* endPtr;
+                int frame = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0' || 0 > frame) {
+                    fprintf(stderr, "Error: Invalid frame number '%s' for --dump-frame-json\n", optarg);
+                    exit(1);
+                }
+                hmput(args->dumpJsonFrames, frame, true);
+                break;
+            }
+            case 'J':
+                args->dumpJsonFilePattern = optarg;
+                break;
+            case 'M': {
+                char* endPtr;
+                double speed = strtod(optarg, &endPtr);
+                if (*endPtr != '\0' || speed <= 0.0) {
+                    fprintf(stderr, "Error: Invalid speed multiplier '%s' for --speed (must be > 0)\n", optarg);
+                    exit(1);
+                }
+                args->speedMultiplier = speed;
+                break;
+            }
+            case 'X': {
+                char* endPtr;
+                double speed = strtod(optarg, &endPtr);
+                if (*endPtr != '\0' || speed <= 0.0) {
+                    fprintf(stderr, "Error: Invalid speed '%s' for --fast-forward-speed (must be > 0)\n", optarg);
+                    exit(1);
+                }
+                args->fastForwardSpeed = speed;
+                break;
+            }
+            case 'D':
+                args->debug = true;
+                break;
+            case 'g':
+                args->renderer = optarg;
+                break;
+            case 'z':
+                args->lazyRooms = true;
+                break;
+            case 'G':
+                shput(args->eagerRooms, optarg, true);
+                break;
+            case 'A':
+                shput(args->disassemble, optarg, true);
+                break;
+            case 'T':
+                shput(args->tilesToBeTraced, optarg, true);
+                break;
+            case 'E':
+                args->traceEventInherited = true;
+                break;
+            case 'Z': {
+                char* endPtr;
+                int seedVal = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0') {
+                    fprintf(stderr, "Error: Invalid seed value '%s' for --seed\n", optarg);
+                    exit(1);
+                }
+                args->seed = seedVal;
+                args->hasSeed = true;
+                break;
+            }
+            case 'I':
+                args->recordInputsPath = optarg;
+                break;
+            case 'P':
+                args->playbackInputsPath = optarg;
+                break;
+            case 'q': {
+                char* endPtr;
+                int framesBetween = strtol(optarg, &endPtr, 10);
+                if (*endPtr != '\0' || framesBetween <= 0) {
+                    fprintf(stderr, "Error: Invalid frame count '%s' for --profile-gml-scripts (must be > 0)\n", optarg);
+                    exit(1);
+                }
+                args->profilerFramesBetween = framesBetween;
+                break;
+            }
+            case 'B':
+                args->saveFolder = optarg;
+                break;
+            case 'N': {
+                repeat(arrlen(args->gameArgs), i) {
+                    free(args->gameArgs[i]);
+                }
+                arrfree(args->gameArgs);
+                args->gameArgs = extractRunnerArguments(optarg);
+                break;
+            }
+#ifdef ENABLE_VM_OPCODE_PROFILER
+            case 'Q':
+                args->opcodeProfiler = true;
+                break;
+#endif
+            case 'O':
+                if (!parseOsTypeArg(optarg, &args->osType)) {
+                    fprintf(stderr, "Error: Invalid --os-type value '%s' (expected: ", optarg);
+                    printOsTypeNames(stderr);
+                    fprintf(stderr, ")\n");
+                    exit(1);
+                }
+                break;
+            case 'w': {
+                int32_t w = 0, h = 0;
+                if (sscanf(optarg, "%dx%d", &w, &h) != 2 || 0 >= w || 0 >= h) {
+                    fprintf(stderr, "Error: Invalid --window-size value '%s' (expected WxH, e.g. 960x544)\n", optarg);
+                    exit(1);
+                }
+                args->windowWidth = w;
+                args->windowHeight = h;
+                break;
+            }
+            case 999: {
+                if (strcmp(optarg, "load-in-memory-ahead-of-time") == 0) {
+                    args->loadType = DATAWINLOADTYPE_LOAD_IN_MEMORY_AHEAD_OF_TIME;
+                } else if (strcmp(optarg, "map-file") == 0) {
+                    args->loadType = DATAWINLOADTYPE_MAP_FILE;
+                } else if (strcmp(optarg, "load-per-chunk") == 0) {
+                    args->loadType = DATAWINLOADTYPE_LOAD_PER_CHUNK;
+                } else {
+                    fprintf(stderr, "Error: Unknown load type '%s'\n", optarg);
+                    exit(1);
+                }
+                break;
+            }
+            case 1000: {
+                if (optarg == nullptr) {
+                    args->widescreenAspect = 16.0f / 9.0f;
+                    break;
+                }
+                int aw = 0, ah = 0;
+                double ratio = 0.0;
+                char* endPtr;
+                if (sscanf(optarg, "%d:%d", &aw, &ah) == 2 && aw > 0 && ah > 0) {
+                    args->widescreenAspect = (float) aw / (float) ah;
+                } else if ((ratio = strtod(optarg, &endPtr)), *endPtr == '\0' && ratio > 0.0) {
+                    args->widescreenAspect = (float) ratio;
+                } else {
+                    fprintf(stderr, "Error: Invalid --widescreen-hack value '%s' (expected W:H like 16:9, or a decimal like 1.7778)\n", optarg);
+                    exit(1);
+                }
+                break;
+            }
+            default:
+                printUsage(argv[0]);
+                exit(1);
+        }
+    }
+
+    if (optind >= argc) {
+        fprintf(stderr, "Usage: %s <path to data.win or game.unx>\n", argv[0]);
+        exit(1);
+    }
+
+    args->dataWinPath = argv[optind];
+
+    if (hmlen(args->screenshotFrames) > 0 && args->screenshotPattern == nullptr) {
+        fprintf(stderr, "Error: --screenshot-at-frame requires --screenshot to be set\n");
+        exit(1);
+    }
+
+    if (hmlen(args->screenshotSurfacesFrames) > 0 && args->screenshotSurfacesPattern == nullptr) {
+        fprintf(stderr, "Error: --screenshot-surfaces-at-frame requires --screenshot-surfaces to be set\n");
+        exit(1);
+    }
+
+    if (args->headless && args->speedMultiplier != 1.0) {
+        fprintf(stderr, "You can't set the speed multiplier while running in headless mode! Headless mode always run in real time\n");
+        exit(1);
+    }
+}
+
+static void freeCommandLineArgs(CommandLineArgs* args) {
+    hmfree(args->screenshotFrames);
+    hmfree(args->screenshotSurfacesFrames);
+    hmfree(args->dumpFrames);
+    hmfree(args->dumpJsonFrames);
+    shfree(args->varReadsToBeTraced);
+    shfree(args->varWritesToBeTraced);
+    shfree(args->functionCallsToBeTraced);
+    shfree(args->alarmsToBeTraced);
+    shfree(args->instanceLifecyclesToBeTraced);
+    shfree(args->eventsToBeTraced);
+    shfree(args->collisionsToBeTraced);
+    shfree(args->opcodesToBeTraced);
+    shfree(args->stackToBeTraced);
+    shfree(args->disassemble);
+    shfree(args->tilesToBeTraced);
+    repeat(arrlen(args->gameArgs), i) free(args->gameArgs[i]);
+    arrfree(args->gameArgs);
+}
+
+int main(int argc, char* argv[]) {
+    setbuf(stderr, NULL);
+#ifdef _WIN32
+    timeBeginPeriod(1);
+#endif
+
+    CommandLineArgs args;
+    parseCommandLineArgs(&args, argc, argv);
+    int ret = loop(args, argv[0]);
+    freeCommandLineArgs(&args);
+    return ret;
+}
diff --git a/src/desktop/stb_impl.c b/src/cli/stb_impl.c
similarity index 100%
rename from src/desktop/stb_impl.c
rename to src/cli/stb_impl.c
diff --git a/src/desktop/main.c b/src/loop.c
similarity index 67%
rename from src/desktop/main.c
rename to src/loop.c
index 5aafbb796..eb36180ed 100644
--- a/src/desktop/main.c
+++ b/src/loop.c
@@ -2,10 +2,9 @@
 
 #include "data_win.h"
 #include "vm.h"
+#include "loop.h"
 
 #include "platformdefs.h"
-#include <getopt.h>
-#include <stdarg.h>
 #include "stdio_compat.h"
 #include <stdlib.h>
 #include "string_compat.h"
@@ -60,15 +59,6 @@
 #include "profiler.h"
 #include "gettime.h"
 
-/* For SDL_main */
-#if defined(USE_SDL1)
-#include <SDL/SDL_main.h>
-#elif defined(USE_SDL2)
-#include <SDL2/SDL_main.h>
-#elif defined(USE_SDL3)
-#include <SDL3/SDL_main.h>
-#endif
-
 enum GraphicsAPI gfx;
 
 #if defined(ENABLE_LEGACY_GL) || defined(ENABLE_MODERN_GL)
@@ -224,147 +214,6 @@ static void installGLDebugCallback(void) {
 }
 #endif
 
-// ===[ COMMAND LINE ARGUMENTS ]===
-typedef struct {
-    int key;
-    // We need this dummy value, think that the ds_map is like a Java HashMap NOT a HashSet
-    // (Which is funny, because in Java HashSets are backed by HashMaps lol)
-    bool value;
-} FrameSetEntry;
-
-typedef struct {
-    const char* dataWinPath;
-    const char* saveFolder; // null = default to the directory containing dataWinPath
-    const char* screenshotPattern;
-    FrameSetEntry* screenshotFrames;
-    const char* screenshotSurfacesPattern;
-    FrameSetEntry* screenshotSurfacesFrames;
-    FrameSetEntry* dumpFrames;
-    FrameSetEntry* dumpJsonFrames;
-    const char* dumpJsonFilePattern;
-    StringBooleanEntry* varReadsToBeTraced;
-    StringBooleanEntry* varWritesToBeTraced;
-    StringBooleanEntry* functionCallsToBeTraced;
-    StringBooleanEntry* alarmsToBeTraced;
-    StringBooleanEntry* instanceLifecyclesToBeTraced;
-    StringBooleanEntry* eventsToBeTraced;
-    StringBooleanEntry* collisionsToBeTraced;
-    StringBooleanEntry* opcodesToBeTraced;
-    StringBooleanEntry* stackToBeTraced;
-    StringBooleanEntry* disassemble;
-    StringBooleanEntry* tilesToBeTraced;
-    bool alwaysLogUnknownFunctions;
-    bool alwaysLogStubbedFunctions;
-    bool headless;
-    bool traceFrames;
-    bool printRooms;
-    bool printObjects;
-    bool printShaders;
-    bool printDeclaredFunctions;
-    bool printUnknownFunctions;
-    int exitAtFrame;
-    int traceBytecodeAfterFrame;
-    double speedMultiplier;
-    double fastForwardSpeed;
-    int seed;
-    bool hasSeed;
-    bool debug;
-    bool traceEventInherited;
-    const char* recordInputsPath;
-    const char* playbackInputsPath;
-    const char* renderer;
-    YoYoOperatingSystem osType;
-    int32_t windowWidth, windowHeight; // 0 = auto (gen8 default, or the console-native size for console os-types)
-    float widescreenAspect; // "widescreen hack" target aspect ratio (width/height), 0 = disabled
-    char** gameArgs; // stb_ds array of owned strings, gameArgs[0] = runner executable path
-    bool lazyRooms;
-    StringBooleanEntry* eagerRooms; // stb_ds string-keyed set of room names
-    bool lazyTextures;
-    bool lazyAudio;
-    DataWinLoadType loadType;
-    int profilerFramesBetween; // 0 = disabled
-#ifdef ENABLE_VM_OPCODE_PROFILER
-    bool opcodeProfiler;
-#endif
-    bool disableLogColours;
-} CommandLineArgs;
-
-typedef struct { const char* name; YoYoOperatingSystem value; } OsTypeNameEntry;
-
-static const OsTypeNameEntry OS_TYPE_NAMES[] = {
-    {"unknown",       OS_UNKNOWN},
-    {"windows",       OS_WINDOWS},
-    {"win32",         OS_WINDOWS},
-    {"macosx",        OS_MACOSX},
-    {"macos",         OS_MACOSX},
-    {"psp",           OS_PSP},
-    {"ios",           OS_IOS},
-    {"android",       OS_ANDROID},
-    {"symbian",       OS_SYMBIAN},
-    {"linux",         OS_LINUX},
-    {"winphone",      OS_WINPHONE},
-    {"tizen",         OS_TIZEN},
-    {"win8native",    OS_WIN8NATIVE},
-    {"wiiu",          OS_WIIU},
-    {"3ds",           OS_3DS},
-    {"psvita",        OS_PSVITA},
-    {"bb10",          OS_BB10},
-    {"ps4",           OS_PS4},
-    {"xboxone",       OS_XBOXONE},
-    {"ps3",           OS_PS3},
-    {"xbox360",       OS_XBOX360},
-    {"uwp",           OS_UWP},
-    {"amazon",        OS_AMAZON},
-    {"switch",        OS_SWITCH},
-};
-#define OS_TYPE_NAMES_COUNT (sizeof(OS_TYPE_NAMES)/sizeof(OS_TYPE_NAMES[0]))
-
-static bool parseOsTypeArg(const char* s, YoYoOperatingSystem* out) {
-    forEach(const OsTypeNameEntry, entry, OS_TYPE_NAMES, OS_TYPE_NAMES_COUNT) {
-        if (strcmp(s, entry->name) == 0) {
-            *out = entry->value;
-            return true;
-        }
-    }
-    return false;
-}
-
-static void printOsTypeNames(FILE* out) {
-    forEachIndexed(const OsTypeNameEntry, entry, i, OS_TYPE_NAMES, OS_TYPE_NAMES_COUNT) {
-        fprintf(out, "%s%s", i > 0 ? ", " : "", entry->name);
-    }
-}
-
-static bool logColour;
-
-void platformLog(const logType type, const char *format, va_list va) {
-    FILE *out = stderr;
-    const char* colourPrefix = ANSI_COLOUR_CODE_RESET;
-    const char* textPrefix = "";
-    switch (type) {
-        case LOG_TYPE_NORMAL:
-            out = stdout;
-            break;
-        case LOG_TYPE_WARNING:
-            colourPrefix = ANSI_COLOUR_CODE_BOLD_YELLOW;
-            textPrefix = "Warning: ";
-            break;
-        case LOG_TYPE_ERROR:
-            colourPrefix = ANSI_COLOUR_CODE_BOLD_RED;
-            textPrefix = "Error: ";
-            break;
-        case LOG_TYPE_DEBUG:
-            colourPrefix = ANSI_COLOUR_CODE_BOLD_PURPLE;
-            textPrefix = "Debug: ";
-            break;
-    }
-
-    if (logColour) fputs(colourPrefix, out);
-    fputs(textPrefix, out);
-    if (logColour) fputs(ANSI_COLOUR_CODE_RESET, out);
-    vfprintf(out, format, va);
-}
-
 // Resolves the window size for the specified operating system.
 // The "--window-size" argument takes precedence over the default resolution for each platform.
 static void resolveWindowSize(const CommandLineArgs* args, uint32_t gen8Width, uint32_t gen8Height, int32_t* outW, int32_t* outH) {
@@ -412,7 +261,7 @@ static void resolveWindowSize(const CommandLineArgs* args, uint32_t gen8Width, u
 // Extracts the Runner arguments from a string, returning the values on stb_ds array
 // The "Runner arguments" is used for the "--game-args" and for the game_change GML function
 // Returns the modified array
-static char** extractRunnerArguments(char* rawArguments) {
+char** extractRunnerArguments(char* rawArguments) {
     // The "saveptr" is used for strtok_r to store its state
     // So it is thread safe™
     char *saveptr;
@@ -431,471 +280,6 @@ static char** extractRunnerArguments(char* rawArguments) {
     return array;
 }
 
-static void printUsage(const char *argv0) {
-    logInfo(
-        "Usage: %s <path to data.win or game.unx>\n"
-        "    --help                                 - Show this message\n"
-        "    --screenshot <filename>                - Specify the filename for screenshots\n"
-        "    --screenshot-at-frame <frame>          - Take a screenshot at the specified frame\n"
-        "    --screenshot-surfaces <filename>       - Take a screenshot of all surfaces at the specified frame\n"
-        "    --screenshot-surfaces-at-frame <frame> - Specify the filename for surface screenshots\n"
-#ifndef USE_GLFW2
-        "    --headless                             - Launch without a window\n"
-#endif
-        "    --print-rooms                          - Print all rooms in the game and exit\n"
-        "    --print-objects                        - Print all objects in the game and exit\n"
-        "    --print-shaders                        - Print all shaders in the game and exit\n"
-        "    --print-declared-functions             - Print all declared functions in the game and exit\n"
-        "    --print-unknown-functions              - Print all unknown functions used by the game and exit\n"
-        "    --trace-variable-reads                 - Trace variable reads\n"
-        "    --trace-variable-writes                - Trace variable writes\n"
-        "    --trace-function-calls                 - Trace function calls\n"
-        "    --trace-alarms                         - Trace alarms\n"
-        "    --trace-instance-lifecycles            - Trace instance creations and deletions\n"
-        "    --trace-events                         - Trace events\n"
-        "    --trace-collisions                     - Trace collisions between instances\n"
-        "    --trace-event-inherited                - Trace event inherited calls\n"
-        "    --trace-tiles                          - Trace drawn tiles\n"
-        "    --trace-opcodes                        - Trace opcodes\n"
-        "    --trace-stack                          - Trace stack\n"
-        "    --trace-frames                         - Log frametimes\n"
-        "    --always-log-unknown-functions         - Always log unknown function calls instead of once per script\n"
-        "    --always-log-stubbed-functions         - Always log stubbed function calls instead of once per script\n"
-        "    --exit-at-frame <frame>                - Exit at the specified frame\n"
-        "    --trace-bytecode-after-frame <frame>   - Delay stack and opcode tracing until the specified frame\n"
-        "    --dump-frame <frame>                   - Dump the runner state at the specified frame\n"
-        "    --dump-frame-json <frame>              - Dump the runner state in json at the specified frame\n"
-        "    --dump-frame-json-file <file>          - Specify an output file for runner state dumps\n"
-        "    --speed <speed>                        - Set a normal speed multiplier\n"
-        "    --fast-forward-speed <speed>           - Set a fast-forward speed multiplier\n"
-        "    --seed <seed>                          - Seed for the random number generator\n"
-        "    --debug                                - Enable debug mode\n"
-        "    --disassemble <script>                 - Disassemble the specified script and print to console (* disassembles all)\n"
-        "    --record-inputs <file>                 - Record all keyboard inputs to a file\n"
-        "    --playback-inputs <file>               - Playback input from file\n"
-        "    --renderer <renderer>                  - Set the rendering API\n"
-        "    --lazy-rooms                           - Lazily load rooms, increases load times but reduces memory usage\n"
-        "    --eager-room <rooms>                   - When --lazy-rooms is set, keep these rooms always in memory\n"
-        "    --os-type <os>                         - Set the reported OS type\n"
-        "    --window-size <dimentions>             - Set a custom window size\n"
-        "    --widescreen-hack <aspect ratio>       - Set a custom aspect ratio\n"
-        "    --profile-gml-scripts                  - Log which GML scripts are the heaviest in terms of time and executed instructions\n"
-        "    --save-folder <directory>              - Set the directory will save files will be stored\n"
-        "    --game-args <args>                     - Arguments to pass to the game\n"
-        "    --lazy-textures                        - Load textures into VRAM on first use, improving startup times\n"
-        "    --lazy-audio                           - Load audio into RAM on first use, reducing memory usage\n"
-        "    --load-type <type>                     - Specify how data.win is loaded, per-chunk or all at once\n"
-        "    --disable-log-colours                  - Disable colours for warning, error, and debug logs\n"
-        "    --disable-log-colors                   - Same as --disable-log-colours, but different spelling\n"
-#ifdef EABLE_VM_OPCODE_PROFILER
-        "    --profile-opcodes                      - Rank which GML opcodes were executed the most\n"
-#endif
-        , argv0
-    );
-}
-
-static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[]) {
-    memset(args, 0, sizeof(CommandLineArgs));
-
-    static struct option longOptions[] = {
-        {"help",          no_argument, nullptr, 'H'},
-        {"screenshot",          required_argument, nullptr, 's'},
-        {"screenshot-at-frame", required_argument, nullptr, 'f'},
-        {"screenshot-surfaces", required_argument, nullptr, 'U'},
-        {"screenshot-surfaces-at-frame", required_argument, nullptr, 'V'},
-        {"headless",            no_argument,       nullptr, 'h'},
-        {"print-rooms", no_argument,               nullptr, 'r'},
-        {"print-objects", no_argument,             nullptr, 'b'},
-        {"print-shaders", no_argument,               nullptr, 998},
-        {"print-declared-functions", no_argument,  nullptr, 'p'},
-        {"print-unknown-functions", no_argument, nullptr, 'u'},
-        {"trace-variable-reads", required_argument,  nullptr, 'R'},
-        {"trace-variable-writes", required_argument, nullptr, 'W'},
-        {"trace-function-calls", required_argument,         nullptr, 'c'},
-        {"trace-alarms", required_argument,         nullptr, 'a'},
-        {"trace-instance-lifecycles", required_argument,         nullptr, 'l'},
-        {"trace-events", required_argument,         nullptr, 'e'},
-        {"trace-collisions", required_argument,     nullptr, 'C'},
-        {"trace-event-inherited", no_argument, nullptr, 'E'},
-        {"trace-tiles", required_argument, nullptr, 'T'},
-        {"trace-opcodes", required_argument,       nullptr, 'o'},
-        {"trace-stack", required_argument,         nullptr, 'S'},
-        {"trace-frames", no_argument, nullptr, 'k'},
-        {"always-log-unknown-functions", no_argument, nullptr, 'y'},
-        {"always-log-stubbed-functions", no_argument, nullptr, 'Y'},
-        {"exit-at-frame", required_argument, nullptr, 'x'},
-        {"trace-bytecode-after-frame", required_argument, nullptr, 'F'},
-        {"dump-frame", required_argument, nullptr, 'd'},
-        {"dump-frame-json", required_argument, nullptr, 'j'},
-        {"dump-frame-json-file", required_argument, nullptr, 'J'},
-        {"speed", required_argument, nullptr, 'M'},
-        {"fast-forward-speed", required_argument, nullptr, 'X'},
-        {"seed", required_argument, nullptr, 'Z'},
-        {"debug", no_argument, nullptr, 'D'},
-        {"disassemble", required_argument, nullptr, 'A'},
-        {"record-inputs", required_argument, nullptr, 'I'},
-        {"playback-inputs", required_argument, nullptr, 'P'},
-        {"renderer", required_argument, nullptr, 'g'},
-        {"lazy-rooms", no_argument, nullptr, 'z'},
-        {"eager-room", required_argument, nullptr, 'G'},
-        {"os-type", required_argument, nullptr, 'O'},
-        {"window-size", required_argument, nullptr, 'w'},
-        {"widescreen-hack", optional_argument, nullptr, 1000},
-        {"profile-gml-scripts", required_argument, nullptr, 'q'},
-        {"save-folder", required_argument, nullptr, 'B'},
-        {"game-args", required_argument, nullptr, 'N'},
-        {"lazy-textures", no_argument, nullptr, 'L'},
-        {"lazy-audio", no_argument, nullptr, 'K'},
-        {"load-type", required_argument, nullptr, 999},
-        {"disable-log-colours", no_argument, nullptr, 1003},
-        {"disable-log-colors", no_argument, nullptr, 1003},
-#ifdef ENABLE_VM_OPCODE_PROFILER
-        {"profile-opcodes", no_argument, nullptr, 'Q'},
-#endif
-        {nullptr,               0,                 nullptr,  0 }
-    };
-
-    args->screenshotFrames = nullptr;
-    args->exitAtFrame = -1;
-    args->traceBytecodeAfterFrame = 0;
-    args->speedMultiplier = 1.0;
-    args->fastForwardSpeed = 0.0;
-    args->osType = OS_WINDOWS;
-    args->profilerFramesBetween = 0;
-    args->loadType = DATAWINLOADTYPE_LOAD_IN_MEMORY_AHEAD_OF_TIME;
-    args->disableLogColours = !isatty(1); // 1 == stdout
-    // TODO: detect available driver features
-    // at runtime to improve defaults.
-#if defined(ENABLE_MODERN_GL)
-    args->renderer = "modern-gl";
-#elif defined(ENABLE_LEGACY_GL)
-    args->renderer = "legacy-gl";
-#else
-    args->renderer = "software";
-#endif
-
-    int opt;
-    while ((opt = getopt_long(argc, argv, "", longOptions, nullptr)) != -1) {
-        switch (opt) {
-            case 'H':
-                printUsage(argv[0]);
-                exit(0);
-            case 's':
-                args->screenshotPattern = optarg;
-                break;
-            case 'f': {
-                char* endPtr;
-                int frame = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0' || 0 > frame) {
-                    logError("Invalid frame number '%s'\n", optarg);
-                    exit(1);
-                }
-
-                hmput(args->screenshotFrames, frame, true);
-                break;
-            }
-            case 'U':
-                args->screenshotSurfacesPattern = optarg;
-                break;
-            case 'V': {
-                char* endPtr;
-                int frame = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0' || 0 > frame) {
-                    logError("Invalid frame number '%s' for --screenshot-surfaces-at-frame\n", optarg);
-                    exit(1);
-                }
-                hmput(args->screenshotSurfacesFrames, frame, true);
-                break;
-            }
-            case 'h':
-                args->headless = true;
-                break;
-            case 'r':
-                args->printRooms = true;
-                break;
-            case 'b':
-                args->printObjects = true;
-                break;
-            case 998: {
-                args->printShaders = true;
-                break;
-            }
-            case 'p':
-                args->printDeclaredFunctions = true;
-                break;
-            case 'u':
-                args->printUnknownFunctions = true;
-                break;
-            case 'R':
-                shput(args->varReadsToBeTraced, optarg, true);
-                break;
-            case 'W':
-                shput(args->varWritesToBeTraced, optarg, true);
-                break;
-            case 'c':
-                shput(args->functionCallsToBeTraced, optarg, true);
-                break;
-            case 'a':
-                shput(args->alarmsToBeTraced, optarg, true);
-                break;
-            case 'l':
-                shput(args->instanceLifecyclesToBeTraced, optarg, true);
-                break;
-            case 'L':
-                args->lazyTextures = true;
-                break;
-            case 'K':
-                args->lazyAudio = true;
-                break;
-            case 'e':
-                shput(args->eventsToBeTraced, optarg, true);
-                break;
-            case 'C':
-                shput(args->collisionsToBeTraced, optarg, true);
-                break;
-            case 'o':
-                shput(args->opcodesToBeTraced, optarg, true);
-                break;
-            case 'S':
-                shput(args->stackToBeTraced, optarg, true);
-                break;
-            case 'k':
-                args->traceFrames = true;
-                break;
-            case 'y':
-                args->alwaysLogUnknownFunctions = true;
-                break;
-            case 'Y':
-                args->alwaysLogStubbedFunctions = true;
-                break;
-            case 'x': {
-                char* endPtr;
-                int frame = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0' || 0 > frame) {
-                    logError("Invalid frame number '%s' for --exit-at-frame\n", optarg);
-                    exit(1);
-                }
-                args->exitAtFrame = frame;
-                break;
-            }
-            case 'F': {
-                char* endPtr;
-                int frame = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0' || 0 > frame) {
-                    logError("Invalid frame number '%s' for --trace-bytecode-after-frame\n", optarg);
-                    exit(1);
-                }
-                args->traceBytecodeAfterFrame = frame;
-                break;
-            }
-            case 'd': {
-                char* endPtr;
-                int frame = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0' || 0 > frame) {
-                    logError("Invalid frame number '%s' for --dump-frame\n", optarg);
-                    exit(1);
-                }
-                hmput(args->dumpFrames, frame, true);
-                break;
-            }
-            case 'j': {
-                char* endPtr;
-                int frame = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0' || 0 > frame) {
-                    logError("Invalid frame number '%s' for --dump-frame-json\n", optarg);
-                    exit(1);
-                }
-                hmput(args->dumpJsonFrames, frame, true);
-                break;
-            }
-            case 'J':
-                args->dumpJsonFilePattern = optarg;
-                break;
-            case 'M': {
-                char* endPtr;
-                double speed = strtod(optarg, &endPtr);
-                if (*endPtr != '\0' || speed <= 0.0) {
-                    logError("Invalid speed multiplier '%s' for --speed (must be > 0)\n", optarg);
-                    exit(1);
-                }
-                args->speedMultiplier = speed;
-                break;
-            }
-            case 'X': {
-                char* endPtr;
-                double speed = strtod(optarg, &endPtr);
-                if (*endPtr != '\0' || speed <= 0.0) {
-                    logError("Invalid speed '%s' for --fast-forward-speed (must be > 0)\n", optarg);
-                    exit(1);
-                }
-                args->fastForwardSpeed = speed;
-                break;
-            }
-            case 'D':
-                args->debug = true;
-                break;
-            case 'g':
-                args->renderer = optarg;
-                break;
-            case 'z':
-                args->lazyRooms = true;
-                break;
-            case 'G':
-                shput(args->eagerRooms, optarg, true);
-                break;
-            case 'A':
-                shput(args->disassemble, optarg, true);
-                break;
-            case 'T':
-                shput(args->tilesToBeTraced, optarg, true);
-                break;
-            case 'E':
-                args->traceEventInherited = true;
-                break;
-            case 'Z': {
-                char* endPtr;
-                int seedVal = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0') {
-                    logError("Invalid seed value '%s' for --seed\n", optarg);
-                    exit(1);
-                }
-                args->seed = seedVal;
-                args->hasSeed = true;
-                break;
-            }
-            case 'I':
-                args->recordInputsPath = optarg;
-                break;
-            case 'P':
-                args->playbackInputsPath = optarg;
-                break;
-            case 'q': {
-                char* endPtr;
-                int framesBetween = strtol(optarg, &endPtr, 10);
-                if (*endPtr != '\0' || framesBetween <= 0) {
-                    logError("Invalid frame count '%s' for --profile-gml-scripts (must be > 0)\n", optarg);
-                    exit(1);
-                }
-                args->profilerFramesBetween = framesBetween;
-                break;
-            }
-            case 'B':
-                args->saveFolder = optarg;
-                break;
-            case 'N': {
-                repeat(arrlen(args->gameArgs), i) {
-                    free(args->gameArgs[i]);
-                }
-                arrfree(args->gameArgs);
-                args->gameArgs = extractRunnerArguments(optarg);
-                break;
-            }
-#ifdef ENABLE_VM_OPCODE_PROFILER
-            case 'Q':
-                args->opcodeProfiler = true;
-                break;
-#endif
-            case 'O':
-                if (!parseOsTypeArg(optarg, &args->osType)) {
-                    logError("Invalid --os-type value '%s' (expected: ", optarg);
-                    printOsTypeNames(stderr);
-                    logError(")\n");
-                    exit(1);
-                }
-                break;
-            case 'w': {
-                int32_t w = 0, h = 0;
-                if (sscanf(optarg, "%dx%d", &w, &h) != 2 || 0 >= w || 0 >= h) {
-                    logError("Invalid --window-size value '%s' (expected WxH, e.g. 960x544)\n", optarg);
-                    exit(1);
-                }
-                args->windowWidth = w;
-                args->windowHeight = h;
-                break;
-            }
-            case 999: {
-                if (strcmp(optarg, "load-in-memory-ahead-of-time") == 0) {
-                    args->loadType = DATAWINLOADTYPE_LOAD_IN_MEMORY_AHEAD_OF_TIME;
-                } else if (strcmp(optarg, "map-file") == 0) {
-                    args->loadType = DATAWINLOADTYPE_MAP_FILE;
-                } else if (strcmp(optarg, "load-per-chunk") == 0) {
-                    args->loadType = DATAWINLOADTYPE_LOAD_PER_CHUNK;
-                } else {
-                    logError("Unknown load type '%s'\n", optarg);
-                    exit(1);
-                }
-                break;
-            }
-            case 1000: {
-                if (optarg == nullptr) {
-                    args->widescreenAspect = 16.0f / 9.0f;
-                    break;
-                }
-                int aw = 0, ah = 0;
-                double ratio = 0.0;
-                char* endPtr;
-                if (sscanf(optarg, "%d:%d", &aw, &ah) == 2 && aw > 0 && ah > 0) {
-                    args->widescreenAspect = (float) aw / (float) ah;
-                } else if ((ratio = strtod(optarg, &endPtr)), *endPtr == '\0' && ratio > 0.0) {
-                    args->widescreenAspect = (float) ratio;
-                } else {
-                    logError("Invalid --widescreen-hack value '%s' (expected W:H like 16:9, or a decimal like 1.7778)\n", optarg);
-                    exit(1);
-                }
-                break;
-            }
-            case 1003:
-                args->disableLogColours = true;
-                break;
-            default:
-                printUsage(argv[0]);
-                exit(1);
-        }
-    }
-
-    if (optind >= argc) {
-        printUsage(argv[0]);
-        exit(1);
-    }
-
-    args->dataWinPath = argv[optind];
-
-    if (hmlen(args->screenshotFrames) > 0 && args->screenshotPattern == nullptr) {
-        logError("--screenshot-at-frame requires --screenshot to be set\n");
-        exit(1);
-    }
-
-    if (hmlen(args->screenshotSurfacesFrames) > 0 && args->screenshotSurfacesPattern == nullptr) {
-        logError("--screenshot-surfaces-at-frame requires --screenshot-surfaces to be set\n");
-        exit(1);
-    }
-
-    if (args->headless && args->speedMultiplier != 1.0) {
-        logError("You can't set the speed multiplier while running in headless mode! Headless mode always run in real time\n");
-        exit(1);
-    }
-}
-
-static void freeCommandLineArgs(CommandLineArgs* args) {
-    hmfree(args->screenshotFrames);
-    hmfree(args->screenshotSurfacesFrames);
-    hmfree(args->dumpFrames);
-    hmfree(args->dumpJsonFrames);
-    shfree(args->varReadsToBeTraced);
-    shfree(args->varWritesToBeTraced);
-    shfree(args->functionCallsToBeTraced);
-    shfree(args->alarmsToBeTraced);
-    shfree(args->instanceLifecyclesToBeTraced);
-    shfree(args->eventsToBeTraced);
-    shfree(args->collisionsToBeTraced);
-    shfree(args->opcodesToBeTraced);
-    shfree(args->stackToBeTraced);
-    shfree(args->disassemble);
-    shfree(args->tilesToBeTraced);
-    repeat(arrlen(args->gameArgs), i) free(args->gameArgs[i]);
-    arrfree(args->gameArgs);
-}
-
 // ===[ SCREENSHOT ]===
 // Reads the contents of an FBO (use 0 for the default framebuffer) into a PNG file.
 // If forceOpaque is true, the alpha channel is overwritten with 255, fixing any clobbering done by blending modes.
@@ -1058,24 +442,14 @@ char* collapseNewlines(const char *input) {
 }
 
 // ===[ MAIN ]===
-int main(int argc, char* argv[]) {
-    setbuf(stderr, NULL);
-#ifdef _WIN32
-    timeBeginPeriod(1);
-#endif
-
-    CommandLineArgs args;
-    parseCommandLineArgs(&args, argc, argv);
-
-    logColour = !args.disableLogColours;
-
+int loop(CommandLineArgs args, const char *argv0) {
     char* currentDataWinPath = safeStrdup(args.dataWinPath);
     char** currentGameArgs = args.gameArgs;
     repeat(arrlen(args.gameArgs), i) {
         arrput(currentGameArgs, args.gameArgs[i]);
     }
     // The first argument will ALWAYS be the argv[0]
-    arrins(currentGameArgs, 0, safeStrdup(argv[0]));
+    arrins(currentGameArgs, 0, safeStrdup(argv0));
 
     bool platformInitialized = false;
     int32_t inputFrameCount = 0;
@@ -1326,7 +700,6 @@ int main(int argc, char* argv[]) {
             }
             VM_free(vm);
             DataWin_free(dataWin);
-            freeCommandLineArgs(&args);
             return 0;
         }
 
@@ -1392,7 +765,6 @@ int main(int argc, char* argv[]) {
         if (!platformInitialized) {
             if (!platformInit(windowW, windowH, windowTitle, args.headless)) {
                 DataWin_free(dataWin);
-                freeCommandLineArgs(&args);
                 return 1;
             }
 
@@ -1406,7 +778,6 @@ int main(int argc, char* argv[]) {
                     logError("Failed to initialize GLAD\n");
                     platformExit();
                     DataWin_free(dataWin);
-                    freeCommandLineArgs(&args);
                     return 1;
                 }
             }
@@ -1448,7 +819,6 @@ int main(int argc, char* argv[]) {
             logError("Failed to initialize a renderer\n");
             platformExit();
             DataWin_free(dataWin);
-            freeCommandLineArgs(&args);
             return 1;
         }
 
@@ -1912,7 +1282,6 @@ int main(int argc, char* argv[]) {
         DataWin_free(dataWin);
 
         if (actuallyShuttingDown) {
-            freeCommandLineArgs(&args);
             free(currentDataWinPath);
             repeat(arrlen(currentGameArgs), i) {
                 free(currentGameArgs[i]);
@@ -1951,7 +1320,6 @@ int main(int argc, char* argv[]) {
                 logError("Runner: Launch parameters '%s' did not contain a '-game <file>' entry! Shutting down...\n", nextLaunchParameters);
                 free(nextWorkingDirectory);
                 free(nextLaunchParameters);
-                freeCommandLineArgs(&args);
                 free(currentDataWinPath);
                 repeat(arrlen(newArguments), i) {
                     free(newArguments[i]);
diff --git a/src/loop.h b/src/loop.h
new file mode 100644
index 000000000..273060d21
--- /dev/null
+++ b/src/loop.h
@@ -0,0 +1,104 @@
+#ifndef _BS_LOOP_H_
+#define _BS_LOOP_H_
+
+#include "runner.h"
+
+// ===[ COMMAND LINE ARGUMENTS ]===
+
+typedef struct { const char* name; YoYoOperatingSystem value; } OsTypeNameEntry;
+
+static const OsTypeNameEntry OS_TYPE_NAMES[] = {
+    {"unknown",       OS_UNKNOWN},
+    {"windows",       OS_WINDOWS},
+    {"win32",         OS_WINDOWS},
+    {"macosx",        OS_MACOSX},
+    {"macos",         OS_MACOSX},
+    {"psp",           OS_PSP},
+    {"ios",           OS_IOS},
+    {"android",       OS_ANDROID},
+    {"symbian",       OS_SYMBIAN},
+    {"linux",         OS_LINUX},
+    {"winphone",      OS_WINPHONE},
+    {"tizen",         OS_TIZEN},
+    {"win8native",    OS_WIN8NATIVE},
+    {"wiiu",          OS_WIIU},
+    {"3ds",           OS_3DS},
+    {"psvita",        OS_PSVITA},
+    {"bb10",          OS_BB10},
+    {"ps4",           OS_PS4},
+    {"xboxone",       OS_XBOXONE},
+    {"ps3",           OS_PS3},
+    {"xbox360",       OS_XBOX360},
+    {"uwp",           OS_UWP},
+    {"amazon",        OS_AMAZON},
+    {"switch",        OS_SWITCH},
+};
+#define OS_TYPE_NAMES_COUNT (sizeof(OS_TYPE_NAMES)/sizeof(OS_TYPE_NAMES[0]))
+
+typedef struct {
+    int key;
+    // We need this dummy value, think that the ds_map is like a Java HashMap NOT a HashSet
+    // (Which is funny, because in Java HashSets are backed by HashMaps lol)
+    bool value;
+} FrameSetEntry;
+
+typedef struct {
+    const char* dataWinPath;
+    const char* saveFolder; // null = default to the directory containing dataWinPath
+    const char* screenshotPattern;
+    FrameSetEntry* screenshotFrames;
+    const char* screenshotSurfacesPattern;
+    FrameSetEntry* screenshotSurfacesFrames;
+    FrameSetEntry* dumpFrames;
+    FrameSetEntry* dumpJsonFrames;
+    const char* dumpJsonFilePattern;
+    StringBooleanEntry* varReadsToBeTraced;
+    StringBooleanEntry* varWritesToBeTraced;
+    StringBooleanEntry* functionCallsToBeTraced;
+    StringBooleanEntry* alarmsToBeTraced;
+    StringBooleanEntry* instanceLifecyclesToBeTraced;
+    StringBooleanEntry* eventsToBeTraced;
+    StringBooleanEntry* collisionsToBeTraced;
+    StringBooleanEntry* opcodesToBeTraced;
+    StringBooleanEntry* stackToBeTraced;
+    StringBooleanEntry* disassemble;
+    StringBooleanEntry* tilesToBeTraced;
+    bool alwaysLogUnknownFunctions;
+    bool alwaysLogStubbedFunctions;
+    bool headless;
+    bool traceFrames;
+    bool printRooms;
+    bool printObjects;
+    bool printShaders;
+    bool printDeclaredFunctions;
+    bool printUnknownFunctions;
+    int exitAtFrame;
+    int traceBytecodeAfterFrame;
+    double speedMultiplier;
+    double fastForwardSpeed;
+    int seed;
+    bool hasSeed;
+    bool debug;
+    bool traceEventInherited;
+    const char* recordInputsPath;
+    const char* playbackInputsPath;
+    const char* renderer;
+    YoYoOperatingSystem osType;
+    int32_t windowWidth, windowHeight; // 0 = auto (gen8 default, or the console-native size for console os-types)
+    float widescreenAspect; // "widescreen hack" target aspect ratio (width/height), 0 = disabled
+    char** gameArgs; // stb_ds array of owned strings, gameArgs[0] = runner executable path
+    bool lazyRooms;
+    StringBooleanEntry* eagerRooms; // stb_ds string-keyed set of room names
+    bool lazyTextures;
+    bool lazyAudio;
+    DataWinLoadType loadType;
+    int profilerFramesBetween; // 0 = disabled
+#ifdef ENABLE_VM_OPCODE_PROFILER
+    bool opcodeProfiler;
+#endif
+} CommandLineArgs;
+
+char** extractRunnerArguments(char* rawArguments);
+int loop(CommandLineArgs args, const char *argv0);
+
+#endif
diff --git a/src/desktop/platformdefs.h b/src/platformdefs.h
similarity index 100%
rename from src/desktop/platformdefs.h
rename to src/platformdefs.h

From 07c1d94b9221f30621df357a698e746ab3a53958 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 18:26:15 -0400
Subject: [PATCH 02/15] bruh

---
 .github/workflows/build.yml | 10 +++++-----
 .github/workflows/tests.yml |  2 +-
 CMakeLists.txt              | 16 ++++++++--------
 CMakePresets.json           |  2 +-
 README.md                   |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0455ed3e8..f7d893610 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y cmake libglfw3-dev libbz2-dev
 
       - name: Configure
-        run: cmake -B build -DWERROR=ON -DDESKTOP_BACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
+        run: cmake -B build -DWERROR=ON -DBACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
 
       - name: Build
         run: cmake --build build -j$(nproc)
@@ -71,7 +71,7 @@ jobs:
           sudo cp /tmp/bzip2-1.0.8/bzlib.h /usr/x86_64-w64-mingw32/include/
 
       - name: Configure
-        run: cmake -B build -DCMAKE_TOOLCHAIN_FILE=cmake/mingw-w64.cmake -DWERROR=ON -DDESKTOP_BACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
+        run: cmake -B build -DCMAKE_TOOLCHAIN_FILE=cmake/mingw-w64.cmake -DWERROR=ON -DBACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
 
       - name: Build
         run: cmake --build build -j$(nproc)
@@ -114,7 +114,7 @@ jobs:
       - name: Configure
         run: |
           export PKG_CONFIG_PATH=/usr/local/glfw-x86/lib/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig
-          cmake -B build -DWERROR=ON -DDESKTOP_BACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
+          cmake -B build -DWERROR=ON -DBACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32 "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
 
       - name: Build
         run: cmake --build build -j$(nproc)
@@ -166,7 +166,7 @@ jobs:
               NO_COLOR=1 \
               VERBOSE=1 \
               CC='ccache i486-w64-mingw32-gcc' \
-              DESKTOP_BACKEND=glfw2 \
+              BACKEND=glfw2 \
               GLFW2_LIBS='-lglfw -lopengl32' \
               EXTRALIBS='-latomic' \
               BUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }} \
@@ -398,7 +398,7 @@ jobs:
       - name: Build
         run: |
           sudo mv butterscotch ~/woody
-          sudo chroot ~/woody /bin/sh --login -c 'make -C /butterscotch NO_COLOR=1 VERBOSE=1 CC="${{ matrix.compiler }} ${{ matrix.flags }}" DESKTOP_BACKEND=sdl1 AUDIO_BACKEND=none SDL1_LIBS='-lSDL' DISABLE_MMD=1'
+          sudo chroot ~/woody /bin/sh --login -c 'make -C /butterscotch NO_COLOR=1 VERBOSE=1 CC="${{ matrix.compiler }} ${{ matrix.flags }}" BACKEND=sdl1 AUDIO_BACKEND=none SDL1_LIBS='-lSDL' DISABLE_MMD=1'
 
   build-cxx:
     name: Build as C++
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 017a7fbb8..6482df4d6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,7 +25,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y cmake libglfw3-dev libbz2-dev
 
       - name: Configure
-        run: cmake -B build -DDESKTOP_BACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
+        run: cmake -B build -DBACKEND=glfw3 -DCMAKE_BUILD_TYPE=Release "-DBUTTERSCOTCH_COMMIT_HASH=${{ steps.commit-info.outputs.hash }}" "-DBUTTERSCOTCH_COMMIT_DATE=${{ steps.commit-info.outputs.date }}"
 
       - name: Build Butterscotch
         run: cmake --build build -j$(nproc)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4994dad0..cc61bcb04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,11 +40,11 @@ else()
 endif()
 
 set(PLATFORM "desktop" CACHE STRING "Platform backend")
-set(DESKTOP_BACKEND "" CACHE STRING "Desktop platform backend")
+set(BACKEND "" CACHE STRING "Desktop platform backend")
 set(AUDIO_BACKEND "" CACHE STRING "Audio backend")
 
-if(PLATFORM STREQUAL "desktop" AND DESKTOP_BACKEND STREQUAL "")
-    message(FATAL_ERROR "You need to set a DESKTOP_BACKEND!")
+if(PLATFORM STREQUAL "desktop" AND BACKEND STREQUAL "")
+    message(FATAL_ERROR "You need to set a BACKEND!")
 endif()
 
 # Build metadata
@@ -269,7 +269,7 @@ if(PLATFORM STREQUAL "desktop")
         set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} ${CMAKE_DL_LIBS})
     endif()
 
-    if(DESKTOP_BACKEND STREQUAL "glfw3")
+    if(BACKEND STREQUAL "glfw3")
         add_compile_definitions(USE_GLFW3)
 
         if(MINGW)
@@ -291,7 +291,7 @@ if(PLATFORM STREQUAL "desktop")
             target_link_directories(butterscotch PRIVATE ${GLFW3_LIBRARY_DIRS})
             set(BACKEND_LIBRARIES ${GLFW3_LIBRARIES})
         endif()
-    elseif(DESKTOP_BACKEND STREQUAL "glfw2")
+    elseif(BACKEND STREQUAL "glfw2")
         add_compile_definitions(USE_GLFW2)
 
         find_package(PkgConfig REQUIRED)
@@ -299,13 +299,13 @@ if(PLATFORM STREQUAL "desktop")
         target_include_directories(butterscotch PRIVATE ${GLFW2_INCLUDE_DIRS})
         target_link_directories(butterscotch PRIVATE ${GLFW2_LIBRARY_DIRS})
         set(BACKEND_LIBRARIES ${GLFW2_LIBRARIES})
-    elseif(DESKTOP_BACKEND STREQUAL "sdl1")
+    elseif(BACKEND STREQUAL "sdl1")
         add_compile_definitions(USE_SDL1)
 
         find_package(SDL REQUIRED)
         target_include_directories(butterscotch PUBLIC ${SDL_INCLUDE_DIR})
         set(BACKEND_LIBRARIES ${SDL_LIBRARY})
-    elseif(DESKTOP_BACKEND STREQUAL "sdl2")
+    elseif(BACKEND STREQUAL "sdl2")
         add_compile_definitions(USE_SDL2)
 
         find_package(PkgConfig REQUIRED)
@@ -313,7 +313,7 @@ if(PLATFORM STREQUAL "desktop")
         target_include_directories(butterscotch PRIVATE ${SDL2_INCLUDE_DIRS})
         target_link_directories(butterscotch PRIVATE ${SDL2_LIBRARY_DIRS})
         set(BACKEND_LIBRARIES ${SDL2_LIBRARIES})
-    elseif(DESKTOP_BACKEND STREQUAL "sdl3")
+    elseif(BACKEND STREQUAL "sdl3")
         add_compile_definitions(USE_SDL3)
 
         find_package(PkgConfig REQUIRED)
diff --git a/CMakePresets.json b/CMakePresets.json
index 782f022f6..c81d0b973 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -8,7 +8,7 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "PLATFORM": "desktop",
-        "DESKTOP_BACKEND": "glfw3",
+        "BACKEND": "glfw3",
         "ENABLE_ASAN": false,
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
       }
diff --git a/README.md b/README.md
index 421b3d5c9..d5a5f5eb2 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ The following compilers have been tested to successfully build butterscotch, old
 
 ```bash
 mkdir build && cd build
-cmake -DPLATFORM=desktop -DDESKTOP_BACKEND=glfw3 -DCMAKE_BUILD_TYPE=Debug ..
+cmake -DPLATFORM=desktop -DBACKEND=glfw3 -DCMAKE_BUILD_TYPE=Debug ..
 make
 ```
 

From 4157b44090f8652e10ea0800dfcf27c9f9d1ec22 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 18:28:05 -0400
Subject: [PATCH 03/15] bleh

---
 CMakeLists.txt | 6 +++---
 Makefile       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc61bcb04..529e01d17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,11 +39,11 @@ else()
     endif()
 endif()
 
-set(PLATFORM "desktop" CACHE STRING "Platform backend")
+set(PLATFORM "cli" CACHE STRING "Platform backend")
 set(BACKEND "" CACHE STRING "Desktop platform backend")
 set(AUDIO_BACKEND "" CACHE STRING "Audio backend")
 
-if(PLATFORM STREQUAL "desktop" AND BACKEND STREQUAL "")
+if(PLATFORM STREQUAL "cli" AND BACKEND STREQUAL "")
     message(FATAL_ERROR "You need to set a BACKEND!")
 endif()
 
@@ -203,7 +203,7 @@ if(ENABLE_VM_EXCEPTIONS_LOGS)
     add_compile_definitions(ENABLE_VM_EXCEPTIONS_LOGS)
 endif()
 
-if(PLATFORM STREQUAL "desktop")
+if(PLATFORM STREQUAL "cli")
     # Matches the GitHub Actions container flags (FORTIFY requires building with optimizations enabled!)
     target_compile_options(butterscotch PRIVATE "$<$<CONFIG:Release,RelWithDebInfo>:-U_FORTIFY_SOURCE;-D_FORTIFY_SOURCE=2>")
 
diff --git a/Makefile b/Makefile
index 4f195d39c..3c083ccab 100644
--- a/Makefile
+++ b/Makefile
@@ -69,12 +69,12 @@ ifndef DISABLE_WAD17
 DEFINES += $(DEFINE)ENABLE_WAD17
 endif
 
-# TODO: add support for non-desktop backends
-SRCS += $(wildcard src/desktop/*.c) src/backends/$(BACKEND).c
+# TODO: add support for non-cli backends
+SRCS += $(wildcard src/cli/*.c) src/backends/$(BACKEND).c
 ifeq ($(OS),Windows)
 PKG_CONFIG_FLAGS := --static
 endif
-INCLUDES += $(INCLUDE)src/desktop
+INCLUDES += $(INCLUDE)src/cli
 ifeq ($(BACKEND),glfw3)
 GLFW3_LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs glfw3)
 LIBS += $(GLFW3_LIBS)

From 28de0089897c93b51eda853a05ce52d09fa4596d Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 18:30:59 -0400
Subject: [PATCH 04/15] cli

---
 CMakePresets.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index c81d0b973..a87d7d429 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -7,7 +7,7 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
-        "PLATFORM": "desktop",
+        "PLATFORM": "cli",
         "BACKEND": "glfw3",
         "ENABLE_ASAN": false,
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"

From c4d0f44fed29c340aec48ef58b13affb9754a027 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 18:36:35 -0400
Subject: [PATCH 05/15] fix

---
 src/cli/main.c | 3 ---
 src/loop.c     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cli/main.c b/src/cli/main.c
index 402083558..c5e222068 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -486,9 +486,6 @@ static void freeCommandLineArgs(CommandLineArgs* args) {
 
 int main(int argc, char* argv[]) {
     setbuf(stderr, NULL);
-#ifdef _WIN32
-    timeBeginPeriod(1);
-#endif
 
     CommandLineArgs args;
     parseCommandLineArgs(&args, argc, argv);
diff --git a/src/loop.c b/src/loop.c
index eb36180ed..1ec3ef1d1 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -443,6 +443,9 @@ char* collapseNewlines(const char *input) {
 
 // ===[ MAIN ]===
 int loop(CommandLineArgs args, const char *argv0) {
+#ifdef _WIN32
+    timeBeginPeriod(1);
+#endif
     char* currentDataWinPath = safeStrdup(args.dataWinPath);
     char** currentGameArgs = args.gameArgs;
     repeat(arrlen(args.gameArgs), i) {

From 8603f18700add68dcfb45922998cd927e1db26c7 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 19:15:35 -0400
Subject: [PATCH 06/15] ok

---
 src/android/stb_impl.c           | 3 ---
 src/cli/stb_impl.c               | 3 ---
 src/ps3/stb_impl.c               | 3 ---
 src/{ps2/stb_impl.c => stb_ds.c} | 0
 src/web-meta/stb_impl.c          | 2 --
 src/web/stb_impl.c               | 3 ---
 6 files changed, 14 deletions(-)
 rename src/{ps2/stb_impl.c => stb_ds.c} (100%)
 delete mode 100644 src/web-meta/stb_impl.c

diff --git a/src/android/stb_impl.c b/src/android/stb_impl.c
index c349348c7..873f3656b 100644
--- a/src/android/stb_impl.c
+++ b/src/android/stb_impl.c
@@ -4,6 +4,3 @@
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"
-
-#define STB_DS_IMPLEMENTATION
-#include "stb_ds.h"
diff --git a/src/cli/stb_impl.c b/src/cli/stb_impl.c
index c349348c7..873f3656b 100644
--- a/src/cli/stb_impl.c
+++ b/src/cli/stb_impl.c
@@ -4,6 +4,3 @@
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"
-
-#define STB_DS_IMPLEMENTATION
-#include "stb_ds.h"
diff --git a/src/ps3/stb_impl.c b/src/ps3/stb_impl.c
index c349348c7..873f3656b 100644
--- a/src/ps3/stb_impl.c
+++ b/src/ps3/stb_impl.c
@@ -4,6 +4,3 @@
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"
-
-#define STB_DS_IMPLEMENTATION
-#include "stb_ds.h"
diff --git a/src/ps2/stb_impl.c b/src/stb_ds.c
similarity index 100%
rename from src/ps2/stb_impl.c
rename to src/stb_ds.c
diff --git a/src/web-meta/stb_impl.c b/src/web-meta/stb_impl.c
deleted file mode 100644
index 9df32fd7b..000000000
--- a/src/web-meta/stb_impl.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STB_DS_IMPLEMENTATION
-#include "stb_ds.h"
diff --git a/src/web/stb_impl.c b/src/web/stb_impl.c
index c349348c7..873f3656b 100644
--- a/src/web/stb_impl.c
+++ b/src/web/stb_impl.c
@@ -4,6 +4,3 @@
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"
-
-#define STB_DS_IMPLEMENTATION
-#include "stb_ds.h"

From 1541b3ed48119fe02d556aab3dea58d4b02c4dd4 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 19:35:04 -0400
Subject: [PATCH 07/15] move shit around

---
 src/cli/main.c     |  17 +++++--
 src/loop.c         |  11 +----
 src/loop.h         |  97 +---------------------------------------
 src/platformdefs.h | 109 +++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 116 insertions(+), 118 deletions(-)

diff --git a/src/cli/main.c b/src/cli/main.c
index c5e222068..fe43712dd 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -158,11 +158,11 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
     // TODO: detect available driver features
     // at runtime to improve defaults.
 #if defined(ENABLE_MODERN_GL)
-    args->renderer = "modern-gl";
+    args->renderer = MODERN_GL;
 #elif defined(ENABLE_LEGACY_GL)
-    args->renderer = "legacy-gl";
+    args->renderer = LEGACY_GL;
 #else
-    args->renderer = "software";
+    args->renderer = SOFTWARE;
 #endif
 
     int opt;
@@ -326,7 +326,16 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 args->debug = true;
                 break;
             case 'g':
-                args->renderer = optarg;
+                if (strcmp(optarg, "modern-gl") == 0)
+                    args->renderer = MODERN_GL;
+                else if (strcmp(optarg, "legacy-gl") == 0)
+                    args->renderer = LEGACY_GL;
+                else if (strcmp(optarg, "software") == 0)
+                    args->renderer = SOFTWARE;
+                else {
+                    fprintf(stderr, "Unknown renderer: %s!\n", optarg);
+                    exit(1);
+                }
                 break;
             case 'z':
                 args->lazyRooms = true;
diff --git a/src/loop.c b/src/loop.c
index 1ec3ef1d1..be8dc4564 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -726,16 +726,7 @@ int loop(CommandLineArgs args, const char *argv0) {
         OverlayFileSystem* overlayFs = OverlayFileSystem_create(dataWinDir, savePath);
         free(dataWinDir);
 
-        if (strcmp(args.renderer, "modern-gl") == 0)
-            gfx = MODERN_GL;
-        else if (strcmp(args.renderer, "legacy-gl") == 0)
-            gfx = LEGACY_GL;
-        else if (strcmp(args.renderer, "software") == 0)
-            gfx = SOFTWARE;
-        else {
-            logError("Unknown renderer: %s!\n", args.renderer);
-            return 1;
-        }
+        gfx = args.renderer;
 
 #ifndef ENABLE_LEGACY_GL
         if (gfx == LEGACY_GL) {
diff --git a/src/loop.h b/src/loop.h
index 273060d21..8b4bc681a 100644
--- a/src/loop.h
+++ b/src/loop.h
@@ -1,102 +1,7 @@
 #ifndef _BS_LOOP_H_
 #define _BS_LOOP_H_
 
-#include "runner.h"
-
-// ===[ COMMAND LINE ARGUMENTS ]===
-
-typedef struct { const char* name; YoYoOperatingSystem value; } OsTypeNameEntry;
-
-static const OsTypeNameEntry OS_TYPE_NAMES[] = {
-    {"unknown",       OS_UNKNOWN},
-    {"windows",       OS_WINDOWS},
-    {"win32",         OS_WINDOWS},
-    {"macosx",        OS_MACOSX},
-    {"macos",         OS_MACOSX},
-    {"psp",           OS_PSP},
-    {"ios",           OS_IOS},
-    {"android",       OS_ANDROID},
-    {"symbian",       OS_SYMBIAN},
-    {"linux",         OS_LINUX},
-    {"winphone",      OS_WINPHONE},
-    {"tizen",         OS_TIZEN},
-    {"win8native",    OS_WIN8NATIVE},
-    {"wiiu",          OS_WIIU},
-    {"3ds",           OS_3DS},
-    {"psvita",        OS_PSVITA},
-    {"bb10",          OS_BB10},
-    {"ps4",           OS_PS4},
-    {"xboxone",       OS_XBOXONE},
-    {"ps3",           OS_PS3},
-    {"xbox360",       OS_XBOX360},
-    {"uwp",           OS_UWP},
-    {"amazon",        OS_AMAZON},
-    {"switch",        OS_SWITCH},
-};
-#define OS_TYPE_NAMES_COUNT (sizeof(OS_TYPE_NAMES)/sizeof(OS_TYPE_NAMES[0]))
-
-typedef struct {
-    int key;
-    // We need this dummy value, think that the ds_map is like a Java HashMap NOT a HashSet
-    // (Which is funny, because in Java HashSets are backed by HashMaps lol)
-    bool value;
-} FrameSetEntry;
-
-typedef struct {
-    const char* dataWinPath;
-    const char* saveFolder; // null = default to the directory containing dataWinPath
-    const char* screenshotPattern;
-    FrameSetEntry* screenshotFrames;
-    const char* screenshotSurfacesPattern;
-    FrameSetEntry* screenshotSurfacesFrames;
-    FrameSetEntry* dumpFrames;
-    FrameSetEntry* dumpJsonFrames;
-    const char* dumpJsonFilePattern;
-    StringBooleanEntry* varReadsToBeTraced;
-    StringBooleanEntry* varWritesToBeTraced;
-    StringBooleanEntry* functionCallsToBeTraced;
-    StringBooleanEntry* alarmsToBeTraced;
-    StringBooleanEntry* instanceLifecyclesToBeTraced;
-    StringBooleanEntry* eventsToBeTraced;
-    StringBooleanEntry* collisionsToBeTraced;
-    StringBooleanEntry* opcodesToBeTraced;
-    StringBooleanEntry* stackToBeTraced;
-    StringBooleanEntry* disassemble;
-    StringBooleanEntry* tilesToBeTraced;
-    bool alwaysLogUnknownFunctions;
-    bool alwaysLogStubbedFunctions;
-    bool headless;
-    bool traceFrames;
-    bool printRooms;
-    bool printObjects;
-    bool printShaders;
-    bool printDeclaredFunctions;
-    bool printUnknownFunctions;
-    int exitAtFrame;
-    int traceBytecodeAfterFrame;
-    double speedMultiplier;
-    double fastForwardSpeed;
-    int seed;
-    bool hasSeed;
-    bool debug;
-    bool traceEventInherited;
-    const char* recordInputsPath;
-    const char* playbackInputsPath;
-    const char* renderer;
-    YoYoOperatingSystem osType;
-    int32_t windowWidth, windowHeight; // 0 = auto (gen8 default, or the console-native size for console os-types)
-    float widescreenAspect; // "widescreen hack" target aspect ratio (width/height), 0 = disabled
-    char** gameArgs; // stb_ds array of owned strings, gameArgs[0] = runner executable path
-    bool lazyRooms;
-    StringBooleanEntry* eagerRooms; // stb_ds string-keyed set of room names
-    bool lazyTextures;
-    bool lazyAudio;
-    DataWinLoadType loadType;
-    int profilerFramesBetween; // 0 = disabled
-#ifdef ENABLE_VM_OPCODE_PROFILER
-    bool opcodeProfiler;
-#endif
-} CommandLineArgs;
+#include "platformdefs.h"
 
 char** extractRunnerArguments(char* rawArguments);
 int loop(CommandLineArgs args, const char *argv0);
diff --git a/src/platformdefs.h b/src/platformdefs.h
index ad93f4b81..4fd878bdc 100644
--- a/src/platformdefs.h
+++ b/src/platformdefs.h
@@ -6,6 +6,107 @@
 #include "runner.h"
 #include "input_recording.h"
 
+// ===[ COMMAND LINE ARGUMENTS ]===
+
+typedef struct { const char* name; YoYoOperatingSystem value; } OsTypeNameEntry;
+
+static const OsTypeNameEntry OS_TYPE_NAMES[] = {
+    {"unknown",       OS_UNKNOWN},
+    {"windows",       OS_WINDOWS},
+    {"win32",         OS_WINDOWS},
+    {"macosx",        OS_MACOSX},
+    {"macos",         OS_MACOSX},
+    {"psp",           OS_PSP},
+    {"ios",           OS_IOS},
+    {"android",       OS_ANDROID},
+    {"symbian",       OS_SYMBIAN},
+    {"linux",         OS_LINUX},
+    {"winphone",      OS_WINPHONE},
+    {"tizen",         OS_TIZEN},
+    {"win8native",    OS_WIN8NATIVE},
+    {"wiiu",          OS_WIIU},
+    {"3ds",           OS_3DS},
+    {"psvita",        OS_PSVITA},
+    {"bb10",          OS_BB10},
+    {"ps4",           OS_PS4},
+    {"xboxone",       OS_XBOXONE},
+    {"ps3",           OS_PS3},
+    {"xbox360",       OS_XBOX360},
+    {"uwp",           OS_UWP},
+    {"amazon",        OS_AMAZON},
+    {"switch",        OS_SWITCH},
+};
+#define OS_TYPE_NAMES_COUNT (sizeof(OS_TYPE_NAMES)/sizeof(OS_TYPE_NAMES[0]))
+
+typedef struct {
+    int key;
+    // We need this dummy value, think that the ds_map is like a Java HashMap NOT a HashSet
+    // (Which is funny, because in Java HashSets are backed by HashMaps lol)
+    bool value;
+} FrameSetEntry;
+
+enum GraphicsAPI {
+    SOFTWARE,
+    MODERN_GL,
+    LEGACY_GL
+};
+
+typedef struct {
+    const char* dataWinPath;
+    const char* saveFolder; // null = default to the directory containing dataWinPath
+    const char* screenshotPattern;
+    FrameSetEntry* screenshotFrames;
+    const char* screenshotSurfacesPattern;
+    FrameSetEntry* screenshotSurfacesFrames;
+    FrameSetEntry* dumpFrames;
+    FrameSetEntry* dumpJsonFrames;
+    const char* dumpJsonFilePattern;
+    StringBooleanEntry* varReadsToBeTraced;
+    StringBooleanEntry* varWritesToBeTraced;
+    StringBooleanEntry* functionCallsToBeTraced;
+    StringBooleanEntry* alarmsToBeTraced;
+    StringBooleanEntry* instanceLifecyclesToBeTraced;
+    StringBooleanEntry* eventsToBeTraced;
+    StringBooleanEntry* collisionsToBeTraced;
+    StringBooleanEntry* opcodesToBeTraced;
+    StringBooleanEntry* stackToBeTraced;
+    StringBooleanEntry* disassemble;
+    StringBooleanEntry* tilesToBeTraced;
+    bool alwaysLogUnknownFunctions;
+    bool alwaysLogStubbedFunctions;
+    bool headless;
+    bool traceFrames;
+    bool printRooms;
+    bool printObjects;
+    bool printShaders;
+    bool printDeclaredFunctions;
+    bool printUnknownFunctions;
+    int exitAtFrame;
+    int traceBytecodeAfterFrame;
+    double speedMultiplier;
+    double fastForwardSpeed;
+    int seed;
+    bool hasSeed;
+    bool debug;
+    bool traceEventInherited;
+    const char* recordInputsPath;
+    const char* playbackInputsPath;
+    enum GraphicsAPI renderer;
+    YoYoOperatingSystem osType;
+    int32_t windowWidth, windowHeight; // 0 = auto (gen8 default, or the console-native size for console os-types)
+    float widescreenAspect; // "widescreen hack" target aspect ratio (width/height), 0 = disabled
+    char** gameArgs; // stb_ds array of owned strings, gameArgs[0] = runner executable path
+    bool lazyRooms;
+    StringBooleanEntry* eagerRooms; // stb_ds string-keyed set of room names
+    bool lazyTextures;
+    bool lazyAudio;
+    DataWinLoadType loadType;
+    int profilerFramesBetween; // 0 = disabled
+#ifdef ENABLE_VM_OPCODE_PROFILER
+    bool opcodeProfiler;
+#endif
+} CommandLineArgs;
+
 bool platformInit(int32_t reqW, int32_t reqH, const char *title, bool headless);
 void platformInitFunctions(Runner *);
 void platformExit(void);
@@ -20,14 +121,6 @@ void platformSetWindowSize(int32_t width, int32_t height);
 void platformSetWindowTitle(const char* title);
 void platformSleepUntil(uint64_t time);
 
-enum GraphicsAPI {
-    SOFTWARE,
-    MODERN_GL,
-    LEGACY_GL
-};
-
-extern enum GraphicsAPI gfx;
-
 extern InputRecording *globalInputRecording;
 
 // ===[ GL Versions ]===

From c773c56f820460e692e1f17f7cb7b881d74fce87 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 19:44:22 -0400
Subject: [PATCH 08/15] embedded

---
 src/embedded/main.c     | 35 +++++++++++++++++++++++++++++++++++
 src/embedded/stb_impl.c |  6 ++++++
 2 files changed, 41 insertions(+)
 create mode 100644 src/embedded/main.c
 create mode 100644 src/embedded/stb_impl.c

diff --git a/src/embedded/main.c b/src/embedded/main.c
new file mode 100644
index 000000000..ef98aa338
--- /dev/null
+++ b/src/embedded/main.c
@@ -0,0 +1,35 @@
+#include <loop.h>
+
+/* For SDL_main */
+#if defined(USE_SDL1)
+#include <SDL/SDL_main.h>
+#elif defined(USE_SDL2)
+#include <SDL2/SDL_main.h>
+#elif defined(USE_SDL3)
+#include <SDL3/SDL_main.h>
+#endif
+
+int main(int argc, char* argv[]) {
+    setbuf(stderr, NULL);
+
+    CommandLineArgs args;
+
+    args.exitAtFrame = -1;
+    args.traceBytecodeAfterFrame = 0;
+    args.speedMultiplier = 1.0;
+    args.fastForwardSpeed = 0.0;
+    args.osType = OS_WINDOWS;
+    args.profilerFramesBetween = 0;
+    args.loadType = DATAWINLOADTYPE_LOAD_IN_MEMORY_AHEAD_OF_TIME;
+    args.lazyRooms = true;
+#if defined(ENABLE_MODERN_GL)
+    args.renderer = MODERN_GL;
+#elif defined(ENABLE_LEGACY_GL)
+    args.renderer = LEGACY_GL;
+#else
+    args.renderer = SOFTWARE;
+#endif
+
+    int ret = loop(args, argv[0]);
+    return ret;
+}
diff --git a/src/embedded/stb_impl.c b/src/embedded/stb_impl.c
new file mode 100644
index 000000000..873f3656b
--- /dev/null
+++ b/src/embedded/stb_impl.c
@@ -0,0 +1,6 @@
+#define STB_IMAGE_IMPLEMENTATION
+#define STBI_NO_STDIO
+#include "stb_image.h"
+
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image_write.h"

From 8270cb59171c0327bf73bb244b6b312bc39329e7 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 19:58:05 -0400
Subject: [PATCH 09/15] ok

---
 src/embedded/main.c |  1 +
 src/platformdefs.h  | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/embedded/main.c b/src/embedded/main.c
index ef98aa338..d32f202a8 100644
--- a/src/embedded/main.c
+++ b/src/embedded/main.c
@@ -29,6 +29,7 @@ int main(int argc, char* argv[]) {
 #else
     args.renderer = SOFTWARE;
 #endif
+    args.dataWinPath = DATA_WIN_PATH;
 
     int ret = loop(args, argv[0]);
     return ret;
diff --git a/src/platformdefs.h b/src/platformdefs.h
index 4fd878bdc..9071b6a17 100644
--- a/src/platformdefs.h
+++ b/src/platformdefs.h
@@ -38,6 +38,14 @@ static const OsTypeNameEntry OS_TYPE_NAMES[] = {
 };
 #define OS_TYPE_NAMES_COUNT (sizeof(OS_TYPE_NAMES)/sizeof(OS_TYPE_NAMES[0]))
 
+enum GraphicsAPI {
+    SOFTWARE,
+    MODERN_GL,
+    LEGACY_GL
+};
+
+extern enum GraphicsAPI gfx;
+
 typedef struct {
     int key;
     // We need this dummy value, think that the ds_map is like a Java HashMap NOT a HashSet
@@ -45,12 +53,6 @@ typedef struct {
     bool value;
 } FrameSetEntry;
 
-enum GraphicsAPI {
-    SOFTWARE,
-    MODERN_GL,
-    LEGACY_GL
-};
-
 typedef struct {
     const char* dataWinPath;
     const char* saveFolder; // null = default to the directory containing dataWinPath

From 8508589692bfd7c03484d49cf0a5aaff5f926dff Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Fri, 31 Jul 2026 20:00:29 -0400
Subject: [PATCH 10/15] embededed

---
 Makefile            | 14 ++++++++++++--
 src/cli/main.c      |  2 +-
 src/embedded/main.c |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3c083ccab..9ed611c0b 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ INCLUDES += $(INCLUDE). \
 HEADERS += $(wildcard src/*.h) $(shell find vendor -name '*.h')
 SRCS += $(wildcard src/*.c) $(wildcard src/image/*.c) $(wildcard vendor/bzip2/*.c) vendor/md5/md5.c vendor/sha1/sha1.c vendor/base64/base64.c
 
+PLATFORM := cli
 BACKEND := glfw3
 AUDIO_BACKEND := miniaudio
 
@@ -69,8 +70,17 @@ ifndef DISABLE_WAD17
 DEFINES += $(DEFINE)ENABLE_WAD17
 endif
 
-# TODO: add support for non-cli backends
-SRCS += $(wildcard src/cli/*.c) src/backends/$(BACKEND).c
+ifeq ($(PLATFORM),cli)
+SRCS += $(wildcard src/cli/*.c)
+else
+ifeq ($(PLATFORM),embedded)
+SRCS += $(wildcard src/embedded/*.c)
+else
+$(error unknown platform)
+endif
+endif
+
+SRCS += src/backends/$(BACKEND).c
 ifeq ($(OS),Windows)
 PKG_CONFIG_FLAGS := --static
 endif
diff --git a/src/cli/main.c b/src/cli/main.c
index fe43712dd..95ef4e3f1 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -89,7 +89,7 @@ static void printUsage(const char *argv0) {
 }
 
 static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[]) {
-    memset(args, 0, sizeof(CommandLineArgs));
+    ZERO_STRUCT(args);
 
     static struct option longOptions[] = {
         {"help",          no_argument, nullptr, 'H'},
diff --git a/src/embedded/main.c b/src/embedded/main.c
index d32f202a8..953e45d26 100644
--- a/src/embedded/main.c
+++ b/src/embedded/main.c
@@ -12,7 +12,7 @@
 int main(int argc, char* argv[]) {
     setbuf(stderr, NULL);
 
-    CommandLineArgs args;
+    CommandLineArgs args = {0};
 
     args.exitAtFrame = -1;
     args.traceBytecodeAfterFrame = 0;

From 30cf1780c1c753fb296135a76c368cb4f3d72953 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Sat, 1 Aug 2026 13:46:33 -0400
Subject: [PATCH 11/15] fix

---
 src/cli/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cli/main.c b/src/cli/main.c
index 95ef4e3f1..d469ddb74 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -89,7 +89,7 @@ static void printUsage(const char *argv0) {
 }
 
 static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[]) {
-    ZERO_STRUCT(args);
+    ZERO_STRUCT(*args);
 
     static struct option longOptions[] = {
         {"help",          no_argument, nullptr, 'H'},

From 845ecdf2ad0b60be3d830efeac1e7fed6efa4b5b Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Wed, 5 Aug 2026 13:45:01 -0400
Subject: [PATCH 12/15] fixup

---
 src/cli/main.c     | 81 +++++++++++++++++++++++++++++++++-------------
 src/platformdefs.h |  1 +
 2 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/src/cli/main.c b/src/cli/main.c
index d469ddb74..f6e25e6b8 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -26,9 +26,38 @@ static void printOsTypeNames(FILE* out) {
     }
 }
 
+static bool logColour;
+
+void platformLog(const logType type, const char *format, va_list va) {
+    FILE *out = stderr;
+    const char* colourPrefix = ANSI_COLOUR_CODE_RESET;
+    const char* textPrefix = "";
+    switch (type) {
+        case LOG_TYPE_NORMAL:
+            out = stdout;
+            break;
+        case LOG_TYPE_WARNING:
+            colourPrefix = ANSI_COLOUR_CODE_BOLD_YELLOW;
+            textPrefix = "Warning: ";
+            break;
+        case LOG_TYPE_ERROR:
+            colourPrefix = ANSI_COLOUR_CODE_BOLD_RED;
+            textPrefix = "Error: ";
+            break;
+        case LOG_TYPE_DEBUG:
+            colourPrefix = ANSI_COLOUR_CODE_BOLD_PURPLE;
+            textPrefix = "Debug: ";
+            break;
+    }
+
+    if (logColour) fputs(colourPrefix, out);
+    fputs(textPrefix, out);
+    if (logColour) fputs(ANSI_COLOUR_CODE_RESET, out);
+    vfprintf(out, format, va);
+}
+
 static void printUsage(const char *argv0) {
-    fprintf(
-        stderr,
+    logInfo(
         "Usage: %s <path to data.win or game.unx>\n"
         "    --help                                 - Show this message\n"
         "    --screenshot <filename>                - Specify the filename for screenshots\n"
@@ -81,6 +110,8 @@ static void printUsage(const char *argv0) {
         "    --lazy-textures                        - Load textures into VRAM on first use, improving startup times\n"
         "    --lazy-audio                           - Load audio into RAM on first use, reducing memory usage\n"
         "    --load-type <type>                     - Specify how data.win is loaded, per-chunk or all at once\n"
+        "    --disable-log-colours                  - Disable colours for warning, error, and debug logs\n"
+        "    --disable-log-colors                   - Same as --disable-log-colours, but different spelling\n"
 #ifdef EABLE_VM_OPCODE_PROFILER
         "    --profile-opcodes                      - Rank which GML opcodes were executed the most\n"
 #endif
@@ -141,6 +172,8 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
         {"lazy-textures", no_argument, nullptr, 'L'},
         {"lazy-audio", no_argument, nullptr, 'K'},
         {"load-type", required_argument, nullptr, 999},
+        {"disable-log-colours", no_argument, nullptr, 1003},
+        {"disable-log-colors", no_argument, nullptr, 1003},
 #ifdef ENABLE_VM_OPCODE_PROFILER
         {"profile-opcodes", no_argument, nullptr, 'Q'},
 #endif
@@ -155,6 +188,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
     args->osType = OS_WINDOWS;
     args->profilerFramesBetween = 0;
     args->loadType = DATAWINLOADTYPE_LOAD_IN_MEMORY_AHEAD_OF_TIME;
+    args->disableLogColours = !isatty(1); // 1 == stdout
     // TODO: detect available driver features
     // at runtime to improve defaults.
 #if defined(ENABLE_MODERN_GL)
@@ -178,7 +212,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int frame = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0' || 0 > frame) {
-                    fprintf(stderr, "Error: Invalid frame number '%s'\n", optarg);
+                    logError("Invalid frame number '%s'\n", optarg);
                     exit(1);
                 }
 
@@ -192,7 +226,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int frame = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0' || 0 > frame) {
-                    fprintf(stderr, "Error: Invalid frame number '%s' for --screenshot-surfaces-at-frame\n", optarg);
+                    logError("Invalid frame number '%s' for --screenshot-surfaces-at-frame\n", optarg);
                     exit(1);
                 }
                 hmput(args->screenshotSurfacesFrames, frame, true);
@@ -263,7 +297,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int frame = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0' || 0 > frame) {
-                    fprintf(stderr, "Error: Invalid frame number '%s' for --exit-at-frame\n", optarg);
+                    logError("Invalid frame number '%s' for --exit-at-frame\n", optarg);
                     exit(1);
                 }
                 args->exitAtFrame = frame;
@@ -273,7 +307,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int frame = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0' || 0 > frame) {
-                    fprintf(stderr, "Error: Invalid frame number '%s' for --trace-bytecode-after-frame\n", optarg);
+                    logError("Invalid frame number '%s' for --trace-bytecode-after-frame\n", optarg);
                     exit(1);
                 }
                 args->traceBytecodeAfterFrame = frame;
@@ -283,7 +317,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int frame = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0' || 0 > frame) {
-                    fprintf(stderr, "Error: Invalid frame number '%s' for --dump-frame\n", optarg);
+                    logError("Invalid frame number '%s' for --dump-frame\n", optarg);
                     exit(1);
                 }
                 hmput(args->dumpFrames, frame, true);
@@ -293,7 +327,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int frame = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0' || 0 > frame) {
-                    fprintf(stderr, "Error: Invalid frame number '%s' for --dump-frame-json\n", optarg);
+                    logError("Invalid frame number '%s' for --dump-frame-json\n", optarg);
                     exit(1);
                 }
                 hmput(args->dumpJsonFrames, frame, true);
@@ -306,7 +340,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 double speed = strtod(optarg, &endPtr);
                 if (*endPtr != '\0' || speed <= 0.0) {
-                    fprintf(stderr, "Error: Invalid speed multiplier '%s' for --speed (must be > 0)\n", optarg);
+                    logError("Invalid speed multiplier '%s' for --speed (must be > 0)\n", optarg);
                     exit(1);
                 }
                 args->speedMultiplier = speed;
@@ -316,7 +350,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 double speed = strtod(optarg, &endPtr);
                 if (*endPtr != '\0' || speed <= 0.0) {
-                    fprintf(stderr, "Error: Invalid speed '%s' for --fast-forward-speed (must be > 0)\n", optarg);
+                    logError("Invalid speed '%s' for --fast-forward-speed (must be > 0)\n", optarg);
                     exit(1);
                 }
                 args->fastForwardSpeed = speed;
@@ -333,7 +367,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 else if (strcmp(optarg, "software") == 0)
                     args->renderer = SOFTWARE;
                 else {
-                    fprintf(stderr, "Unknown renderer: %s!\n", optarg);
+                    logError("Unknown renderer: %s!\n", optarg);
                     exit(1);
                 }
                 break;
@@ -356,7 +390,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int seedVal = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0') {
-                    fprintf(stderr, "Error: Invalid seed value '%s' for --seed\n", optarg);
+                    logError("Invalid seed value '%s' for --seed\n", optarg);
                     exit(1);
                 }
                 args->seed = seedVal;
@@ -373,7 +407,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 char* endPtr;
                 int framesBetween = strtol(optarg, &endPtr, 10);
                 if (*endPtr != '\0' || framesBetween <= 0) {
-                    fprintf(stderr, "Error: Invalid frame count '%s' for --profile-gml-scripts (must be > 0)\n", optarg);
+                    logError("Invalid frame count '%s' for --profile-gml-scripts (must be > 0)\n", optarg);
                     exit(1);
                 }
                 args->profilerFramesBetween = framesBetween;
@@ -397,16 +431,16 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
 #endif
             case 'O':
                 if (!parseOsTypeArg(optarg, &args->osType)) {
-                    fprintf(stderr, "Error: Invalid --os-type value '%s' (expected: ", optarg);
+                    logError("Invalid --os-type value '%s' (expected: ", optarg);
                     printOsTypeNames(stderr);
-                    fprintf(stderr, ")\n");
+                    logError(")\n");
                     exit(1);
                 }
                 break;
             case 'w': {
                 int32_t w = 0, h = 0;
                 if (sscanf(optarg, "%dx%d", &w, &h) != 2 || 0 >= w || 0 >= h) {
-                    fprintf(stderr, "Error: Invalid --window-size value '%s' (expected WxH, e.g. 960x544)\n", optarg);
+                    logError("Invalid --window-size value '%s' (expected WxH, e.g. 960x544)\n", optarg);
                     exit(1);
                 }
                 args->windowWidth = w;
@@ -421,7 +455,7 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 } else if (strcmp(optarg, "load-per-chunk") == 0) {
                     args->loadType = DATAWINLOADTYPE_LOAD_PER_CHUNK;
                 } else {
-                    fprintf(stderr, "Error: Unknown load type '%s'\n", optarg);
+                    logError("Unknown load type '%s'\n", optarg);
                     exit(1);
                 }
                 break;
@@ -439,11 +473,14 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
                 } else if ((ratio = strtod(optarg, &endPtr)), *endPtr == '\0' && ratio > 0.0) {
                     args->widescreenAspect = (float) ratio;
                 } else {
-                    fprintf(stderr, "Error: Invalid --widescreen-hack value '%s' (expected W:H like 16:9, or a decimal like 1.7778)\n", optarg);
+                    logError("Invalid --widescreen-hack value '%s' (expected W:H like 16:9, or a decimal like 1.7778)\n", optarg);
                     exit(1);
                 }
                 break;
             }
+            case 1003:
+                args->disableLogColours = true;
+                break;
             default:
                 printUsage(argv[0]);
                 exit(1);
@@ -451,24 +488,24 @@ static void parseCommandLineArgs(CommandLineArgs* args, int argc, char* argv[])
     }
 
     if (optind >= argc) {
-        fprintf(stderr, "Usage: %s <path to data.win or game.unx>\n", argv[0]);
+        printUsage(argv[0]);
         exit(1);
     }
 
     args->dataWinPath = argv[optind];
 
     if (hmlen(args->screenshotFrames) > 0 && args->screenshotPattern == nullptr) {
-        fprintf(stderr, "Error: --screenshot-at-frame requires --screenshot to be set\n");
+        logError("--screenshot-at-frame requires --screenshot to be set\n");
         exit(1);
     }
 
     if (hmlen(args->screenshotSurfacesFrames) > 0 && args->screenshotSurfacesPattern == nullptr) {
-        fprintf(stderr, "Error: --screenshot-surfaces-at-frame requires --screenshot-surfaces to be set\n");
+        logError("--screenshot-surfaces-at-frame requires --screenshot-surfaces to be set\n");
         exit(1);
     }
 
     if (args->headless && args->speedMultiplier != 1.0) {
-        fprintf(stderr, "You can't set the speed multiplier while running in headless mode! Headless mode always run in real time\n");
+        logError("You can't set the speed multiplier while running in headless mode! Headless mode always run in real time\n");
         exit(1);
     }
 }
diff --git a/src/platformdefs.h b/src/platformdefs.h
index 9071b6a17..607a7065e 100644
--- a/src/platformdefs.h
+++ b/src/platformdefs.h
@@ -107,6 +107,7 @@ typedef struct {
 #ifdef ENABLE_VM_OPCODE_PROFILER
     bool opcodeProfiler;
 #endif
+    bool disableLogColours;
 } CommandLineArgs;
 
 bool platformInit(int32_t reqW, int32_t reqH, const char *title, bool headless);

From 63159dee50558473591ba5ba9f30cb9a1307673e Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Wed, 5 Aug 2026 13:46:23 -0400
Subject: [PATCH 13/15] isatty

---
 src/cli/main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cli/main.c b/src/cli/main.c
index f6e25e6b8..53185ee28 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -1,5 +1,10 @@
 #include <loop.h>
 #include <getopt.h>
+#ifdef _WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
 
 /* For SDL_main */
 #if defined(USE_SDL1)

From ec8074e9fcda4e2e9321efeb91edc415e1051519 Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Wed, 5 Aug 2026 13:58:37 -0400
Subject: [PATCH 14/15] fix

---
 src/cli/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cli/main.c b/src/cli/main.c
index 53185ee28..5567634d4 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -540,6 +540,7 @@ int main(int argc, char* argv[]) {
 
     CommandLineArgs args;
     parseCommandLineArgs(&args, argc, argv);
+    logColour = !args.disableLogColours;
     int ret = loop(args, argv[0]);
     freeCommandLineArgs(&args);
     return ret;

From d44df98f84462e6abfc50ac84900c9db3b3e8f0c Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart@gmail.com>
Date: Wed, 5 Aug 2026 14:05:21 -0400
Subject: [PATCH 15/15] log

---
 src/embedded/log.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/embedded/log.c

diff --git a/src/embedded/log.c b/src/embedded/log.c
new file mode 100644
index 000000000..72f897411
--- /dev/null
+++ b/src/embedded/log.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+
+#include "log.h"
+
+void platformLog(const logType type, const char *format, va_list va) {
+    FILE *out = stderr;
+    switch (type) {
+        case LOG_TYPE_NORMAL:
+            out = stdout;
+            break;
+        case LOG_TYPE_WARNING:
+            fputs("Warning: ", out);
+            break;
+        case LOG_TYPE_ERROR:
+            fputs("Error: ", out);
+            break;
+		case LOG_TYPE_DEBUG:
+            fputs("Debug: ", out);
+            break;
+    }
+    vfprintf(out, format, va);
+}