From f898608e65bc20c7c49ac0f87802226cdc021b6d Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Mon, 23 Mar 2026 15:08:56 +1100
Subject: [PATCH 01/31] CMakeLists:

 - use dependent options to de-nest some configuration (requires bumping version to 3.22)
 - further de-nest by inverting MINIFB_USE_WAYLAND_API to make an internal MINIFB_USE_X11_API
 - change old "UNIX"/"APPLE"/"IOS"/"WIN32" etc to more modern CMAKE_SYSTEM_NAME STREQUAL <name>

should hopefully function no different to previous version, which i've verified for x11, but only x11
STILL A WIP, will do more later
---
 CMakeLists.txt | 280 +++++++++++++++++++++++++------------------------
 1 file changed, 144 insertions(+), 136 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ea0c98..477d527 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,10 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.22)
 project(MiniFB VERSION 0.10.0 LANGUAGES C CXX)
 
-if (APPLE)
+# remove before this is merged
+message(STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
     include(CheckLanguage)
     check_language(OBJC)
     if (CMAKE_OBJC_COMPILER)
@@ -132,7 +135,7 @@ set(MINIFB_COMPILE_DEFINITIONS)
 set(MINIFB_LINK_OPTIONS_LIB)
 set(MINIFB_LINK_OPTIONS_EXE)
 
-if (DJGPP)
+if (CMAKE_SYSTEM_NAME STREQUAL "DOS")
     # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
     set(MINIFB_C_EXTENSIONS   ON)
     set(MINIFB_CXX_EXTENSIONS ON)
@@ -146,24 +149,41 @@ endif()
 option(MINIFB_BUILD_EXAMPLES "Build minifb example programs" TRUE)
 option(MINIFB_AVOID_CPP_HEADERS "Avoid including C++ Headers" FALSE)
 
-if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
-    option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON)
+include(CMakeDependentOption) # Requires 3.22 to use full condition syntax
+
+# cmake_dependent_option is used to create a default value for options in case their specific condition isn't met.
+# the first 3 args are the same as a normal option(), but the 4th is a condition, where if it's true, expose the option, and if it isn't, the 5th argument is a default value to use.
+# setting the default value lets us de-nest `if(<platform>) if(<option>)` - type stuff, into just `if(<option>)`.
+
+cmake_dependent_option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON
+    "NOT (CMAKE_SYSTEM_NAME STREQUAL \"iOS\" OR CMAKE_SYSTEM_NAME STREQUAL \"Android\" OR CMAKE_SYSTEM_NAME STREQUAL \"Emscripten\")" OFF)
+
+cmake_dependent_option(MINIFB_USE_METAL_API "Build the project using Metal API code" ON
+    "CMAKE_SYSTEM_NAME STREQUAL \"Darwin\"" OFF)
+cmake_dependent_option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF
+    "CMAKE_SYSTEM_NAME STREQUAL \"Darwin\"" OFF)
+
+cmake_dependent_option(MINIFB_USE_WAYLAND_API "Build the project using Wayland API code" OFF
+    "CMAKE_SYSTEM_NAME STREQUAL \"Linux\"" OFF)
+
+# purely for internal use, never exposed to the user. easier than `if(NOT MINIFB_USE_WAYLAND_API AND CMAKE_SYSTEM_NAME STREQUAL "Linux")` every time.
+if (NOT MINIFB_USE_WAYLAND_API AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(MINIFB_USE_X11_API ON)
 else()
-    set(MINIFB_BUILD_VERSION_INFO OFF)
+    set(MINIFB_USE_X11_API OFF)
 endif()
 
-if (APPLE AND NOT IOS)
-    option(MINIFB_USE_METAL_API "Build the project using metal API code" ON)
-    option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF)
+cmake_dependent_option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" OFF
+    "MINIFB_USE_X11_API OR CMAKE_SYSTEM_NAME STREQUAL \"Windows\"" OFF)
+
+# unfortunatly these old deprecated options can't fit nicely into dependent options due to our custom function, but when we remove these, we can remove this whole block
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     minifb_apply_deprecated_option(USE_METAL_API MINIFB_USE_METAL_API "Build the project using metal API code")
     minifb_apply_deprecated_option(USE_INVERTED_Y_ON_MACOS MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)")
-elseif (UNIX AND NOT EMSCRIPTEN)
-    option(MINIFB_USE_WAYLAND_API "Build the project using wayland API code" OFF)
-    option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     minifb_apply_deprecated_option(USE_WAYLAND_API MINIFB_USE_WAYLAND_API "Build the project using wayland API code")
     minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
-elseif (WIN32)
-    option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
 endif()
 
@@ -173,7 +193,7 @@ if (NOT MSVC)
 
     # GCC/Clang
 
-    if (DJGPP)
+    if (CMAKE_SYSTEM_NAME STREQUAL "DOS")
         list(APPEND MINIFB_COMPILE_OPTIONS
             "$<$<CONFIG:Debug>:-gdwarf>"
             "$<$<CONFIG:Debug>:-save-temps>"
@@ -194,6 +214,7 @@ if (NOT MSVC)
         "$<IF:$<CONFIG:Debug>,-O0,-O2>"
     )
 
+    # TODO: why specifically not apple, and is this suppression neccecary anyway?
     if (NOT APPLE)
         list(APPEND MINIFB_COMPILE_OPTIONS
             -Wno-cast-function-type
@@ -237,6 +258,9 @@ else()
         list(APPEND MINIFB_COMPILE_OPTIONS /Gm)
     endif()
 
+    # prevent annoying c standard lib unsafety msvc warnings
+    list(APPEND MINIFB_COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
+
 endif()
 
 list(APPEND MINIFB_COMPILE_DEFINITIONS
@@ -244,65 +268,51 @@ list(APPEND MINIFB_COMPILE_DEFINITIONS
     "$<$<CONFIG:Debug>:DEBUG>"
 )
 
-if (EMSCRIPTEN)
+# TODO: does the toolchain include this automatically?
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     list(APPEND MINIFB_LINK_OPTIONS_EXE
         "$<$<CONFIG:Debug>:-g>"
     )
 endif()
 
-# Set compiler/platform specific flags and dependencies
+# Set platform specific flags and source files
 #--------------------------------------
-if (WIN32)
-
-    if (MSVC)
-        list(APPEND MINIFB_COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
-    endif()
-    list(APPEND MINIFB_COMPILE_DEFINITIONS _WIN32_WINNT=0x0601)  # Windows 7 (we are in 2026)
 
-    if (USE_OPENGL_API)
-        list(APPEND SrcLib ${SrcGL})
+if (MINIFB_USE_INVERTED_Y_ON_MACOS)
+    list(APPEND MINIFB_COMPILE_DEFINITIONS USE_INVERTED_Y_ON_MACOS)
+endif()
 
-        list(APPEND MINIFB_COMPILE_DEFINITIONS USE_OPENGL_API)
-    endif()
+# Add GL/Metal code if we're using GL/Metal, no matter the backend
+if (MINIFB_USE_OPENGL_API)
+    list(APPEND SrcLib ${SrcGL})
+    list(APPEND MINIFB_COMPILE_DEFINITIONS USE_OPENGL_API)
+endif()
+if (MINIFB_USE_METAL_API)
+    list(APPEND MINIFB_COMPILE_DEFINITIONS USE_METAL_API)
+    list(APPEND SrcLib ${SrcMacOSMetal})
+endif()
 
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    list(APPEND MINIFB_COMPILE_DEFINITIONS _WIN32_WINNT=0x0601)  # Windows 7 (we are in 2026)
     list(APPEND SrcLib ${SrcWindows})
 
-elseif (IOS)
-
+elseif (CMAKE_SYSTEM_NAME STREQUAL "iOS")
     list(APPEND SrcLib ${SrcIOS})
 
-elseif (APPLE)
-
-    if (USE_METAL_API)
-        list(APPEND MINIFB_COMPILE_DEFINITIONS USE_METAL_API)
-        list(APPEND SrcLib ${SrcMacOSMetal})
-    endif()
-
-    if (USE_INVERTED_Y_ON_MACOS)
-        list(APPEND MINIFB_COMPILE_DEFINITIONS USE_INVERTED_Y_ON_MACOS)
-    endif()
-
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     list(APPEND SrcLib ${SrcMacOS})
 
-elseif (UNIX)
+elseif (MINIFB_USE_WAYLAND_API)
+    list(APPEND SrcLib ${SrcWayland})
 
-    if (USE_WAYLAND_API)
-        list(APPEND SrcLib ${SrcWayland})
-    elseif (EMSCRIPTEN)
-        list(APPEND SrcLib ${SrcWeb})
-    else()
-        if (USE_OPENGL_API)
-            list(APPEND SrcLib ${SrcGL})
+elseif (MINIFB_USE_X11_API)
+    list(APPEND SrcLib ${SrcX11})
 
-            list(APPEND MINIFB_COMPILE_DEFINITIONS USE_OPENGL_API)
-        endif()
-        list(APPEND SrcLib ${SrcX11})
-    endif()
-
-elseif (DJGPP)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    list(APPEND SrcLib ${SrcWeb})
 
+elseif (CMAKE_SYSTEM_NAME STREQUAL "DOS")
     list(APPEND SrcLib ${SrcDOS})
-
 endif()
 
 # Library
@@ -314,85 +324,86 @@ add_library(minifb::minifb ALIAS minifb)
 
 # Link
 #--------------------------------------
-if (APPLE)
+if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
 
-    if (IOS)
-        target_link_libraries(minifb PRIVATE
-            "-framework UIKit"
-            "-framework QuartzCore"
-            "-framework Metal"
-            "-framework MetalKit"
-        )
-    else()
-        target_link_libraries(minifb PRIVATE
-            "-framework Cocoa"
-            "-framework QuartzCore"
-            "-framework Metal"
-            "-framework MetalKit"
-        )
+    target_link_libraries(minifb PRIVATE
+        "-framework UIKit"
+        "-framework QuartzCore"
+        "-framework Metal"
+        "-framework MetalKit"
+    )
+
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+
+    target_link_libraries(minifb PRIVATE
+        "-framework Cocoa"
+        "-framework QuartzCore"
+        "-framework Metal"
+        "-framework MetalKit"
+    )
+
+elseif (MINIFB_USE_WAYLAND_API)
+
+    find_package(PkgConfig)
+    if (NOT PKG_CONFIG_FOUND)
+        message(FATAL_ERROR "pkg-config is required to locate Wayland development files")
     endif()
+    pkg_check_modules(WAYLAND REQUIRED wayland-client wayland-cursor xkbcommon)
 
-elseif (UNIX)
+    target_include_directories(minifb PRIVATE ${WAYLAND_INCLUDE_DIRS})
+    target_link_directories(minifb PRIVATE ${WAYLAND_LIBRARY_DIRS})
+    target_link_libraries(minifb PRIVATE
+        ${WAYLAND_LIBRARIES}
+    )
 
-    if (USE_WAYLAND_API)
-        find_package(PkgConfig)
-        if (NOT PKG_CONFIG_FOUND)
-            message(FATAL_ERROR "pkg-config is required to locate Wayland development files")
-        endif()
-        pkg_check_modules(WAYLAND REQUIRED wayland-client wayland-cursor xkbcommon)
+elseif(MINIFB_USE_X11_API)
+    find_package(X11)
+    if (NOT X11_FOUND)
+        message(FATAL_ERROR "X11 development files not found (install X11 headers/libs, e.g. libx11-dev)")
+    endif()
 
-        target_include_directories(minifb PRIVATE ${WAYLAND_INCLUDE_DIRS})
-        target_link_directories(minifb PRIVATE ${WAYLAND_LIBRARY_DIRS})
-        target_link_libraries(minifb PRIVATE
-            ${WAYLAND_LIBRARIES}
-        )
-    elseif (EMSCRIPTEN)
-        list(APPEND MINIFB_LINK_OPTIONS_EXE
-            "-sSTRICT=1"
-            "-sENVIRONMENT=web"
-            "-sMODULARIZE=1"
-            "-sALLOW_MEMORY_GROWTH=1"
-            "-sALLOW_TABLE_GROWTH"
-            "-sMALLOC=emmalloc"
-            "-sEXPORT_ALL=1"
-            "-sEXPORTED_FUNCTIONS=[\"_malloc\",\"_free\",\"_main\"]"
-            "-sEXPORTED_RUNTIME_METHODS=ccall,cwrap"
-            "-sASYNCIFY"
-            "--no-entry"
-            "-sSINGLE_FILE"
-        )
-    else()
-        find_package(X11)
-        if (NOT X11_FOUND)
-            message(FATAL_ERROR "X11 development files not found (install X11 headers/libs, e.g. libx11-dev)")
+    target_link_libraries(minifb PRIVATE
+        X11::X11
+        #"-lxkbcommon"
+    )
+    if (X11_Xrandr_FOUND)
+        if (TARGET X11::Xrandr)
+            target_link_libraries(minifb PRIVATE X11::Xrandr)
+        else()
+            target_link_libraries(minifb PRIVATE ${X11_Xrandr_LIB})
+        endif()
+        target_compile_definitions(minifb PRIVATE MINIFB_HAS_XRANDR)
+    endif()
+    if (MINIFB_USE_OPENGL_API)
+        find_package(OpenGL)
+        if (NOT OpenGL_FOUND)
+            message(FATAL_ERROR "OpenGL development files not found (install OpenGL headers/libs, e.g. mesa-common-dev/libgl1-mesa-dev)")
         endif()
-
         target_link_libraries(minifb PRIVATE
-            X11::X11
-            #"-lxkbcommon"
+            OpenGL::GL
         )
-        if (X11_Xrandr_FOUND)
-            if (TARGET X11::Xrandr)
-                target_link_libraries(minifb PRIVATE X11::Xrandr)
-            else()
-                target_link_libraries(minifb PRIVATE ${X11_Xrandr_LIB})
-            endif()
-            target_compile_definitions(minifb PRIVATE MINIFB_HAS_XRANDR)
-        endif()
-        if (USE_OPENGL_API)
-            find_package(OpenGL)
-            if (NOT OpenGL_FOUND)
-                message(FATAL_ERROR "OpenGL development files not found (install OpenGL headers/libs, e.g. mesa-common-dev/libgl1-mesa-dev)")
-            endif()
-            target_link_libraries(minifb PRIVATE
-                OpenGL::GL
-            )
-        endif()
     endif()
 
-elseif (WIN32)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+
+    list(APPEND MINIFB_LINK_OPTIONS_EXE
+        "-sSTRICT=1"
+        "-sENVIRONMENT=web"
+        "-sMODULARIZE=1"
+        "-sALLOW_MEMORY_GROWTH=1"
+        "-sALLOW_TABLE_GROWTH"
+        "-sMALLOC=emmalloc"
+        "-sEXPORT_ALL=1"
+        "-sEXPORTED_FUNCTIONS=[\"_malloc\",\"_free\",\"_main\"]"
+        "-sEXPORTED_RUNTIME_METHODS=ccall,cwrap"
+        "-sASYNCIFY"
+        "--no-entry"
+        "-sSINGLE_FILE"
+    )
 
-    if (USE_OPENGL_API)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+
+    if (MINIFB_USE_OPENGL_API)
         find_package(OpenGL)
         if (NOT OpenGL_FOUND)
             message(FATAL_ERROR "OpenGL not found for Windows; install the required SDK components")
@@ -448,8 +459,9 @@ endif()
 
 # Examples
 #--------------------------------------
+# TODO: clean up further
 if (MINIFB_BUILD_EXAMPLES)
-    if (NOT IOS)
+    if (NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
 
         add_executable(noise examples/noise.c)
         add_executable(input_events examples/input_events.c)
@@ -471,7 +483,7 @@ if (MINIFB_BUILD_EXAMPLES)
             hide_cursor
         )
 
-        if (EMSCRIPTEN)
+        if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
 
             add_custom_target(web_assets
                 COMMAND ${CMAKE_COMMAND} -E copy_directory
@@ -493,7 +505,7 @@ if (MINIFB_BUILD_EXAMPLES)
 
         endif()
 
-        if (DJGPP)
+        if (CMAKE_SYSTEM_NAME STREQUAL "DOS")
 
             add_executable(debug_dos
                 examples/dos/debug_dos.c
@@ -598,15 +610,11 @@ set(MINIFB_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/minifb")
 set(MINIFB_PACKAGE_FIND_OPENGL FALSE)
 set(MINIFB_PACKAGE_FIND_X11 FALSE)
 
-if (WIN32 AND USE_OPENGL_API)
+if (MINIFB_USE_OPENNGL_API)
     set(MINIFB_PACKAGE_FIND_OPENGL TRUE)
-elseif (UNIX AND NOT APPLE AND NOT EMSCRIPTEN)
-    if (NOT USE_WAYLAND_API)
-        set(MINIFB_PACKAGE_FIND_X11 TRUE)
-        if (USE_OPENGL_API)
-            set(MINIFB_PACKAGE_FIND_OPENGL TRUE)
-        endif()
-    endif()
+endif()
+if (MINIFB_USE_X11_API)
+	set(MINIFB_PACKAGE_FIND_X11 TRUE)
 endif()
 
 minifb_configure_package_config_file(
@@ -626,8 +634,8 @@ install(FILES
     DESTINATION "${MINIFB_CMAKE_CONFIG_INSTALL_DIR}"
 )
 
-message(STATUS "Done " ${PROJECT_NAME})
-
 if (MSVC AND MINIFB_BUILD_EXAMPLES)
     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT noise)
 endif()
+
+message(STATUS "Done " ${PROJECT_NAME})

From 12502fe1833512d43dfd45a380237042914f9df6 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Mon, 30 Mar 2026 12:06:41 +1100
Subject: [PATCH 02/31] improve some msvc compile flags

 - Remove a deprecated flag (/Gm)
 - Move a flag dependant on MSVC version (/sdl) to always be applied (it would previously be applied in Visual Studio 2015+, which is no longer supported by microsoft)
 - Clarify the comment for an exsting flag
---
 CMakeLists.txt | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 477d527..3535710 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,8 +237,10 @@ else()
         /fp:fast
         # Force Visual Studio to actualize __cplusplus version macro
         /Zc:__cplusplus
+        # Additional security checks
+        /sdl
 
-        # Program database for edit and continue
+        # Program database (edit and continue in debug mode)
         "$<IF:$<CONFIG:Debug>,/ZI,/Zi>"
         # Optimizations
         "$<IF:$<CONFIG:Debug>,/Od,/O2>"
@@ -248,16 +250,6 @@ else()
         "$<$<CONFIG:Debug>:/RTC1>"
     )
 
-    if (MSVC_VERSION GREATER_EQUAL 1900)
-        # SDL checks 2015+
-        list(APPEND MINIFB_COMPILE_OPTIONS /sdl)
-    endif()
-
-    if (MSVC_VERSION LESS_EQUAL 1920)
-        # Enable Minimal Rebuild (required for Edit and Continue) (deprecated)
-        list(APPEND MINIFB_COMPILE_OPTIONS /Gm)
-    endif()
-
     # prevent annoying c standard lib unsafety msvc warnings
     list(APPEND MINIFB_COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
 
@@ -614,7 +606,7 @@ if (MINIFB_USE_OPENNGL_API)
     set(MINIFB_PACKAGE_FIND_OPENGL TRUE)
 endif()
 if (MINIFB_USE_X11_API)
-	set(MINIFB_PACKAGE_FIND_X11 TRUE)
+    set(MINIFB_PACKAGE_FIND_X11 TRUE)
 endif()
 
 minifb_configure_package_config_file(

From 668b9b7af9aebdeb1a42f6e39ad2cf5585c588be Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Mon, 30 Mar 2026 12:32:17 +1100
Subject: [PATCH 03/31] fix typo

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3535710..c948c96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -602,7 +602,7 @@ set(MINIFB_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/minifb")
 set(MINIFB_PACKAGE_FIND_OPENGL FALSE)
 set(MINIFB_PACKAGE_FIND_X11 FALSE)
 
-if (MINIFB_USE_OPENNGL_API)
+if (MINIFB_USE_OPENGL_API)
     set(MINIFB_PACKAGE_FIND_OPENGL TRUE)
 endif()
 if (MINIFB_USE_X11_API)

From d2172ede215f2b17d630d84e989f08321a92c6fa Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 2 Apr 2026 01:15:16 +1100
Subject: [PATCH 04/31] remove some seemingly useless cmake variables

---
 CMakeLists.txt | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c948c96..c4acde5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -599,15 +599,6 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/"
 install(FILES "${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 set(MINIFB_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/minifb")
-set(MINIFB_PACKAGE_FIND_OPENGL FALSE)
-set(MINIFB_PACKAGE_FIND_X11 FALSE)
-
-if (MINIFB_USE_OPENGL_API)
-    set(MINIFB_PACKAGE_FIND_OPENGL TRUE)
-endif()
-if (MINIFB_USE_X11_API)
-    set(MINIFB_PACKAGE_FIND_X11 TRUE)
-endif()
 
 minifb_configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/minifb-config.cmake.in"

From 06e5b67bafb700db061871775593a8b6a343e7bc Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 2 Apr 2026 11:58:44 +1100
Subject: [PATCH 05/31] revert CMAKE_SYSTEM_NAME system checking

also introduce `LINUX` and `MACOS` variables to check those systems in a more precise way
---
 CMakeLists.txt | 67 +++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4acde5..557de6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,15 @@
 cmake_minimum_required(VERSION 3.22)
 project(MiniFB VERSION 0.10.0 LANGUAGES C CXX)
 
-# remove before this is merged
-message(STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME})
+# prefer these over general `UNIX` or `APPLE`
+# `UNIX` also overlaps MacOS, iOS, and Emscripten, which we don't want
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(LINUX TRUE)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(MACOS TRUE)
+endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if (MACOS OR IOS)
     include(CheckLanguage)
     check_language(OBJC)
     if (CMAKE_OBJC_COMPILER)
@@ -135,7 +140,7 @@ set(MINIFB_COMPILE_DEFINITIONS)
 set(MINIFB_LINK_OPTIONS_LIB)
 set(MINIFB_LINK_OPTIONS_EXE)
 
-if (CMAKE_SYSTEM_NAME STREQUAL "DOS")
+if (DJGPP)
     # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
     set(MINIFB_C_EXTENSIONS   ON)
     set(MINIFB_CXX_EXTENSIONS ON)
@@ -153,37 +158,37 @@ include(CMakeDependentOption) # Requires 3.22 to use full condition syntax
 
 # cmake_dependent_option is used to create a default value for options in case their specific condition isn't met.
 # the first 3 args are the same as a normal option(), but the 4th is a condition, where if it's true, expose the option, and if it isn't, the 5th argument is a default value to use.
-# setting the default value lets us de-nest `if(<platform>) if(<option>)` - type stuff, into just `if(<option>)`.
+# setting the default value lets us de-nest `if(<platform>) if(<option>)` type stuff, into just `if(<option>)`.
 
 cmake_dependent_option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON
-    "NOT (CMAKE_SYSTEM_NAME STREQUAL \"iOS\" OR CMAKE_SYSTEM_NAME STREQUAL \"Android\" OR CMAKE_SYSTEM_NAME STREQUAL \"Emscripten\")" OFF)
+    "NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN" OFF)
 
 cmake_dependent_option(MINIFB_USE_METAL_API "Build the project using Metal API code" ON
-    "CMAKE_SYSTEM_NAME STREQUAL \"Darwin\"" OFF)
+    "MACOS" OFF)
 cmake_dependent_option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF
-    "CMAKE_SYSTEM_NAME STREQUAL \"Darwin\"" OFF)
+	"MACOS" OFF)
 
 cmake_dependent_option(MINIFB_USE_WAYLAND_API "Build the project using Wayland API code" OFF
-    "CMAKE_SYSTEM_NAME STREQUAL \"Linux\"" OFF)
+	"LINUX" OFF)
 
-# purely for internal use, never exposed to the user. easier than `if(NOT MINIFB_USE_WAYLAND_API AND CMAKE_SYSTEM_NAME STREQUAL "Linux")` every time.
-if (NOT MINIFB_USE_WAYLAND_API AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+# purely for internal use, never exposed to the user. easier than `if(NOT MINIFB_USE_WAYLAND_API AND LINUX)` every time.
+if (NOT MINIFB_USE_WAYLAND_API AND LINUX)
     set(MINIFB_USE_X11_API ON)
 else()
     set(MINIFB_USE_X11_API OFF)
 endif()
 
 cmake_dependent_option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" OFF
-    "MINIFB_USE_X11_API OR CMAKE_SYSTEM_NAME STREQUAL \"Windows\"" OFF)
+    "MINIFB_USE_X11_API OR WIN32" OFF)
 
 # unfortunatly these old deprecated options can't fit nicely into dependent options due to our custom function, but when we remove these, we can remove this whole block
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    minifb_apply_deprecated_option(USE_METAL_API MINIFB_USE_METAL_API "Build the project using metal API code")
+if (MACOS)
+    minifb_apply_deprecated_option(USE_METAL_API MINIFB_USE_METAL_API "Build the project using Metal API code")
     minifb_apply_deprecated_option(USE_INVERTED_Y_ON_MACOS MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    minifb_apply_deprecated_option(USE_WAYLAND_API MINIFB_USE_WAYLAND_API "Build the project using wayland API code")
+elseif (LINUX)
+    minifb_apply_deprecated_option(USE_WAYLAND_API MINIFB_USE_WAYLAND_API "Build the project using Wayland API code")
     minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+elseif (WIN32)
     minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
 endif()
 
@@ -193,7 +198,7 @@ if (NOT MSVC)
 
     # GCC/Clang
 
-    if (CMAKE_SYSTEM_NAME STREQUAL "DOS")
+    if (DJGPP)
         list(APPEND MINIFB_COMPILE_OPTIONS
             "$<$<CONFIG:Debug>:-gdwarf>"
             "$<$<CONFIG:Debug>:-save-temps>"
@@ -261,7 +266,7 @@ list(APPEND MINIFB_COMPILE_DEFINITIONS
 )
 
 # TODO: does the toolchain include this automatically?
-if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+if (EMSCRIPTEN)
     list(APPEND MINIFB_LINK_OPTIONS_EXE
         "$<$<CONFIG:Debug>:-g>"
     )
@@ -284,14 +289,14 @@ if (MINIFB_USE_METAL_API)
     list(APPEND SrcLib ${SrcMacOSMetal})
 endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+if (WIN32)
     list(APPEND MINIFB_COMPILE_DEFINITIONS _WIN32_WINNT=0x0601)  # Windows 7 (we are in 2026)
     list(APPEND SrcLib ${SrcWindows})
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "iOS")
+elseif (IOS)
     list(APPEND SrcLib ${SrcIOS})
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif (DARWIN)
     list(APPEND SrcLib ${SrcMacOS})
 
 elseif (MINIFB_USE_WAYLAND_API)
@@ -300,10 +305,10 @@ elseif (MINIFB_USE_WAYLAND_API)
 elseif (MINIFB_USE_X11_API)
     list(APPEND SrcLib ${SrcX11})
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+elseif (EMSCRIPTEN)
     list(APPEND SrcLib ${SrcWeb})
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "DOS")
+elseif (DJGPP)
     list(APPEND SrcLib ${SrcDOS})
 endif()
 
@@ -316,7 +321,7 @@ add_library(minifb::minifb ALIAS minifb)
 
 # Link
 #--------------------------------------
-if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if (IOS)
 
     target_link_libraries(minifb PRIVATE
         "-framework UIKit"
@@ -325,7 +330,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
         "-framework MetalKit"
     )
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif (MACOS)
 
     target_link_libraries(minifb PRIVATE
         "-framework Cocoa"
@@ -376,7 +381,7 @@ elseif(MINIFB_USE_X11_API)
         )
     endif()
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+elseif (EMSCRIPTEN)
 
     list(APPEND MINIFB_LINK_OPTIONS_EXE
         "-sSTRICT=1"
@@ -393,7 +398,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
         "-sSINGLE_FILE"
     )
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+elseif (WIN32)
 
     if (MINIFB_USE_OPENGL_API)
         find_package(OpenGL)
@@ -453,7 +458,7 @@ endif()
 #--------------------------------------
 # TODO: clean up further
 if (MINIFB_BUILD_EXAMPLES)
-    if (NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+    if (NOT IOS)
 
         add_executable(noise examples/noise.c)
         add_executable(input_events examples/input_events.c)
@@ -475,7 +480,7 @@ if (MINIFB_BUILD_EXAMPLES)
             hide_cursor
         )
 
-        if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+        if (EMSCRIPTEN)
 
             add_custom_target(web_assets
                 COMMAND ${CMAKE_COMMAND} -E copy_directory
@@ -497,7 +502,7 @@ if (MINIFB_BUILD_EXAMPLES)
 
         endif()
 
-        if (CMAKE_SYSTEM_NAME STREQUAL "DOS")
+        if (DJGPP)
 
             add_executable(debug_dos
                 examples/dos/debug_dos.c

From 7abe18bd2e11002a625366c28e8d0f0836d9c60f Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 3 Apr 2026 01:22:05 +1100
Subject: [PATCH 06/31] reverted cmake 3.22 requirement back to 3.16

kept the modern `cmake_dependant_option` code in a seperate path that's still prefered if the available cmake is 3.22 or over
(although they should function nearly identically, having both there means that in the future the old path can be removed)
---
 CMakeLists.txt | 68 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 47 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 557de6f..c4ddff2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.16)
 project(MiniFB VERSION 0.10.0 LANGUAGES C CXX)
 
 # prefer these over general `UNIX` or `APPLE`
@@ -154,32 +154,58 @@ endif()
 option(MINIFB_BUILD_EXAMPLES "Build minifb example programs" TRUE)
 option(MINIFB_AVOID_CPP_HEADERS "Avoid including C++ Headers" FALSE)
 
-include(CMakeDependentOption) # Requires 3.22 to use full condition syntax
+# purely for internal use, never exposed to the user
+set(MINIFB_USE_X11_API OFF)
 
-# cmake_dependent_option is used to create a default value for options in case their specific condition isn't met.
-# the first 3 args are the same as a normal option(), but the 4th is a condition, where if it's true, expose the option, and if it isn't, the 5th argument is a default value to use.
-# setting the default value lets us de-nest `if(<platform>) if(<option>)` type stuff, into just `if(<option>)`.
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.22) 
 
-cmake_dependent_option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON
-    "NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN" OFF)
+    # requires 3.22+ to use full condition syntax, technically could use in 3.16, but it would be a lot worse
+    include(CMakeDependentOption)
 
-cmake_dependent_option(MINIFB_USE_METAL_API "Build the project using Metal API code" ON
-    "MACOS" OFF)
-cmake_dependent_option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF
-	"MACOS" OFF)
+    # cmake_dependent_option is used to create a default value for options in case their specific condition isn't met.
+    # the first 3 args are the same as a normal option(), but the 4th is a condition, where if it's true, expose the option, and if it isn't, the 5th argument is a default value to use.
+    # setting the default value lets us de-nest `if(<platform>) if(<option>)` type stuff, into just `if(<option>)`.
 
-cmake_dependent_option(MINIFB_USE_WAYLAND_API "Build the project using Wayland API code" OFF
-	"LINUX" OFF)
+    cmake_dependent_option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON
+        "NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN" OFF)
 
-# purely for internal use, never exposed to the user. easier than `if(NOT MINIFB_USE_WAYLAND_API AND LINUX)` every time.
-if (NOT MINIFB_USE_WAYLAND_API AND LINUX)
-    set(MINIFB_USE_X11_API ON)
-else()
-    set(MINIFB_USE_X11_API OFF)
-endif()
+    cmake_dependent_option(MINIFB_USE_METAL_API "Build the project using Metal API code" ON
+        "MACOS" OFF)
+    cmake_dependent_option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF
+        "MACOS" OFF)
+
+    cmake_dependent_option(MINIFB_USE_WAYLAND_API "Build the project using Wayland API code" OFF
+        "LINUX" OFF)
+
+    if (NOT MINIFB_USE_WAYLAND_API AND LINUX)
+        set(MINIFB_USE_X11_API ON)
+    endif()
+
+    cmake_dependent_option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" OFF
+        "MINIFB_USE_X11_API OR WIN32" OFF)
+
+else() # when we upgrade past cmake 3.22, remove this path, the above does the same thing but cleaner
 
-cmake_dependent_option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" OFF
-    "MINIFB_USE_X11_API OR WIN32" OFF)
+    if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
+        option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON)
+    else()
+        set(MINIFB_BUILD_VERSION_INFO OFF)
+    endif()
+
+    if (MACOS)
+        option(MINIFB_USE_METAL_API "Build the project using metal API code" ON)
+        option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF)
+    elseif (LINUX)
+        option(MINIFB_USE_WAYLAND_API "Build the project using wayland API code" OFF)
+		if (NOT MINIFB_USE_WAYLAND_API)
+            option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
+            set(MINIFB_USE_X11_API ON)
+        endif()
+    elseif (WIN32)
+        option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
+    endif()
+
+endif()
 
 # unfortunatly these old deprecated options can't fit nicely into dependent options due to our custom function, but when we remove these, we can remove this whole block
 if (MACOS)

From 7834cae9fab78173db370e9ba11e049b142a1e5e Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Sun, 19 Apr 2026 01:47:27 +1000
Subject: [PATCH 07/31] fix non-dependant-option cmake branch

before this, it wouldn't set default values for when options were no longer relevant, and would instead use the irrelevant old values (bad)
also add a comment explaining this behavior
also fix inconsistancy with default OpenGL enable between the two branches
---
 CMakeLists.txt | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4ddff2..f56c9e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,10 +181,15 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
         set(MINIFB_USE_X11_API ON)
     endif()
 
-    cmake_dependent_option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" OFF
+    cmake_dependent_option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON
         "MINIFB_USE_X11_API OR WIN32" OFF)
 
-else() # when we upgrade past cmake 3.22, remove this path, the above does the same thing but cleaner
+else()
+
+	# even if an `option()` isn't reached, if it's been reached in previous configurations then the old value still exists as a cache variable
+	# this means it can still be seen and edited by tools such as cmake-gui, without any indication that it's not meant to be enabled
+	# this can lead to cases where two conflicting options are active, so we need to manually `set()` values OFF if they're not reached
+	# dependent options fix this, which is why they should be prioritised if available
 
     if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
         option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON)
@@ -193,16 +198,29 @@ else() # when we upgrade past cmake 3.22, remove this path, the above does the s
     endif()
 
     if (MACOS)
-        option(MINIFB_USE_METAL_API "Build the project using metal API code" ON)
+        option(MINIFB_USE_METAL_API "Build the project using Metal API code" ON)
         option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF)
-    elseif (LINUX)
-        option(MINIFB_USE_WAYLAND_API "Build the project using wayland API code" OFF)
-		if (NOT MINIFB_USE_WAYLAND_API)
-            option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
-            set(MINIFB_USE_X11_API ON)
-        endif()
-    elseif (WIN32)
-        option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
+	else()
+		set(MINIFB_USE_METAL_API OFF)
+		set(MINIFB_USE_INVERTED_Y_ON_MACOS OFF)
+	endif()
+
+    if (LINUX)
+        option(MINIFB_USE_WAYLAND_API "Build the project using Wayland API code" OFF)
+	else()
+		set(MINIFB_USE_WAYLAND_API OFF)
+	endif()
+
+	if (LINUX AND NOT MINIFB_USE_WAYLAND_API)
+		set(MINIFB_USE_X11_API ON)
+	else()
+		set(MINIFB_USE_X11_API OFF)
+	endif()
+
+    if (WIN32 OR MINIFB_USE_X11_API)
+		option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
+	else()
+		set(MINIFB_USE_OPENGL_API OFF)
     endif()
 
 endif()
@@ -245,13 +263,6 @@ if (NOT MSVC)
         "$<IF:$<CONFIG:Debug>,-O0,-O2>"
     )
 
-    # TODO: why specifically not apple, and is this suppression neccecary anyway?
-    if (NOT APPLE)
-        list(APPEND MINIFB_COMPILE_OPTIONS
-            -Wno-cast-function-type
-        )
-    endif()
-
 else()
 
     # MSVC

From 6accf0278305aed0cb1be0b9dff59194b6e44071 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Mon, 20 Apr 2026 11:47:44 +1000
Subject: [PATCH 08/31] replace cmake lists with public target properties

previous code used lists such as MINIFB_COMPILE_OPTIONS and MINIFB_COMPILE_DEFINITIONS to apply the same options to both the library and examples.
change to just apply the options/definitions, and extend them to examples with PUBLIC scoping. (so the examples that link the library also apply these properties)

also remove MINIFB_LINK_OPTIONS_LIB and MINIFB_LINK_OPTIONS_EXE, replace with PRIVATE and INTERFACE scoping with target_link_options.
---
 CMakeLists.txt | 113 ++++++++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 71 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f56c9e5..0eb5de1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,25 +130,6 @@ set(SrcDOS
     src/dos/vesa.c
 )
 
-# Set features
-#--------------------------------------
-set(MINIFB_C_STANDARD 11)
-set(MINIFB_CXX_STANDARD 11)
-
-set(MINIFB_COMPILE_OPTIONS)
-set(MINIFB_COMPILE_DEFINITIONS)
-set(MINIFB_LINK_OPTIONS_LIB)
-set(MINIFB_LINK_OPTIONS_EXE)
-
-if (DJGPP)
-    # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
-    set(MINIFB_C_EXTENSIONS   ON)
-    set(MINIFB_CXX_EXTENSIONS ON)
-else()
-    set(MINIFB_C_EXTENSIONS   OFF)
-    set(MINIFB_CXX_EXTENSIONS OFF)
-endif()
-
 # Options
 #--------------------------------------
 option(MINIFB_BUILD_EXAMPLES "Build minifb example programs" TRUE)
@@ -236,6 +217,27 @@ elseif (WIN32)
     minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
 endif()
 
+# Create library target
+#--------------------------------------
+add_library(minifb STATIC
+    ${SrcLib}
+)
+add_library(minifb::minifb ALIAS minifb)
+
+# Set features
+#--------------------------------------
+set(MINIFB_C_STANDARD 11)
+set(MINIFB_CXX_STANDARD 11)
+
+if (DJGPP)
+    # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
+    set(MINIFB_C_EXTENSIONS   ON)
+    set(MINIFB_CXX_EXTENSIONS ON)
+else()
+    set(MINIFB_C_EXTENSIONS   OFF)
+    set(MINIFB_CXX_EXTENSIONS OFF)
+endif()
+
 # Set compile flags depending on the compiler
 #--------------------------------------
 if (NOT MSVC)
@@ -243,17 +245,17 @@ if (NOT MSVC)
     # GCC/Clang
 
     if (DJGPP)
-        list(APPEND MINIFB_COMPILE_OPTIONS
+        target_compile_options(minifb PUBLIC
             "$<$<CONFIG:Debug>:-gdwarf>"
             "$<$<CONFIG:Debug>:-save-temps>"
         )
     else()
-        list(APPEND MINIFB_COMPILE_OPTIONS
+        target_compile_options(minifb PUBLIC
             "$<$<CONFIG:Debug>:-g>"
         )
     endif()
 
-    list(APPEND MINIFB_COMPILE_OPTIONS
+    target_compile_options(minifb PUBLIC
         -Wall
         -Wextra
         -Wno-switch
@@ -268,7 +270,7 @@ else()
     # MSVC
     #--------------------------------------
 
-    list(APPEND MINIFB_COMPILE_OPTIONS
+    target_compile_options(minifb PUBLIC
         # Security check
         /GS
         # Function level linking
@@ -293,18 +295,18 @@ else()
     )
 
     # prevent annoying c standard lib unsafety msvc warnings
-    list(APPEND MINIFB_COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
+    target_compile_definitions(minifb PUBLIC _CRT_SECURE_NO_WARNINGS)
 
 endif()
 
-list(APPEND MINIFB_COMPILE_DEFINITIONS
+target_compile_definitions(minifb PUBLIC
     "$<$<CONFIG:Debug>:_DEBUG>"
     "$<$<CONFIG:Debug>:DEBUG>"
 )
 
 # TODO: does the toolchain include this automatically?
 if (EMSCRIPTEN)
-    list(APPEND MINIFB_LINK_OPTIONS_EXE
+    target_link_options(minifb INTERFACE
         "$<$<CONFIG:Debug>:-g>"
     )
 endif()
@@ -313,49 +315,42 @@ endif()
 #--------------------------------------
 
 if (MINIFB_USE_INVERTED_Y_ON_MACOS)
-    list(APPEND MINIFB_COMPILE_DEFINITIONS USE_INVERTED_Y_ON_MACOS)
+    target_compile_definitions(minifb PUBLIC USE_INVERTED_Y_ON_MACOS)
 endif()
 
 # Add GL/Metal code if we're using GL/Metal, no matter the backend
 if (MINIFB_USE_OPENGL_API)
-    list(APPEND SrcLib ${SrcGL})
-    list(APPEND MINIFB_COMPILE_DEFINITIONS USE_OPENGL_API)
+    target_sources(minifb PRIVATE ${SrcGL})
+    target_compile_definitions(minifb PUBLIC USE_OPENGL_API)
 endif()
 if (MINIFB_USE_METAL_API)
-    list(APPEND MINIFB_COMPILE_DEFINITIONS USE_METAL_API)
-    list(APPEND SrcLib ${SrcMacOSMetal})
+    target_compile_definitions(minifb PUBLIC USE_METAL_API)
+    target_sources(minifb PRIVATE ${SrcMacOSMetal})
 endif()
 
 if (WIN32)
-    list(APPEND MINIFB_COMPILE_DEFINITIONS _WIN32_WINNT=0x0601)  # Windows 7 (we are in 2026)
-    list(APPEND SrcLib ${SrcWindows})
+    target_compile_definitions(minifb PUBLIC _WIN32_WINNT=0x0601)  # Windows 7 (we are in 2026)
+    target_sources(minifb PRIVATE ${SrcWindows})
 
 elseif (IOS)
-    list(APPEND SrcLib ${SrcIOS})
+    target_sources(minifb PRIVATE ${SrcIOS})
 
 elseif (DARWIN)
-    list(APPEND SrcLib ${SrcMacOS})
+    target_sources(minifb PRIVATE ${SrcMacOS})
 
 elseif (MINIFB_USE_WAYLAND_API)
-    list(APPEND SrcLib ${SrcWayland})
+    target_sources(minifb PRIVATE ${SrcWayland})
 
 elseif (MINIFB_USE_X11_API)
-    list(APPEND SrcLib ${SrcX11})
+    target_sources(minifb PRIVATE ${SrcX11})
 
 elseif (EMSCRIPTEN)
-    list(APPEND SrcLib ${SrcWeb})
+    target_sources(minifb PRIVATE ${SrcWeb})
 
 elseif (DJGPP)
-    list(APPEND SrcLib ${SrcDOS})
+    target_sources(minifb PRIVATE ${SrcDOS})
 endif()
 
-# Library
-#--------------------------------------
-add_library(minifb STATIC
-    ${SrcLib}
-)
-add_library(minifb::minifb ALIAS minifb)
-
 # Link
 #--------------------------------------
 if (IOS)
@@ -420,7 +415,7 @@ elseif(MINIFB_USE_X11_API)
 
 elseif (EMSCRIPTEN)
 
-    list(APPEND MINIFB_LINK_OPTIONS_EXE
+    target_link_options(minifb INTERFACE
         "-sSTRICT=1"
         "-sENVIRONMENT=web"
         "-sMODULARIZE=1"
@@ -464,18 +459,6 @@ set_target_properties(minifb PROPERTIES
     CXX_EXTENSIONS ${MINIFB_CXX_EXTENSIONS}
 )
 
-if (MINIFB_COMPILE_OPTIONS)
-    target_compile_options(minifb PRIVATE ${MINIFB_COMPILE_OPTIONS})
-endif()
-
-if (MINIFB_COMPILE_DEFINITIONS)
-    target_compile_definitions(minifb PRIVATE ${MINIFB_COMPILE_DEFINITIONS})
-endif()
-
-if (MINIFB_LINK_OPTIONS_LIB)
-    target_link_options(minifb PRIVATE ${MINIFB_LINK_OPTIONS_LIB})
-endif()
-
 target_include_directories(minifb PUBLIC
     $<BUILD_INTERFACE:${MINIFB_GENERATED_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
@@ -596,18 +579,6 @@ foreach(minifb_test_target IN LISTS MINIFB_EXAMPLE_TARGETS)
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ${MINIFB_CXX_EXTENSIONS}
     )
-
-    if (MINIFB_COMPILE_OPTIONS)
-        target_compile_options(${minifb_test_target} PRIVATE ${MINIFB_COMPILE_OPTIONS})
-    endif()
-
-    if (MINIFB_COMPILE_DEFINITIONS)
-        target_compile_definitions(${minifb_test_target} PRIVATE ${MINIFB_COMPILE_DEFINITIONS})
-    endif()
-
-    if (MINIFB_LINK_OPTIONS_EXE)
-        target_link_options(${minifb_test_target} PRIVATE ${MINIFB_LINK_OPTIONS_EXE})
-    endif()
 endforeach()
 
 # Organize IDE Folders

From 6fcfd2e2683e35c8d5b50cbad64a6cbb14450d14 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Mon, 20 Apr 2026 12:07:17 +1000
Subject: [PATCH 09/31] fix tab formatting

---
 CMakeLists.txt | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0eb5de1..b1cc9c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,10 +167,10 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
 
 else()
 
-	# even if an `option()` isn't reached, if it's been reached in previous configurations then the old value still exists as a cache variable
-	# this means it can still be seen and edited by tools such as cmake-gui, without any indication that it's not meant to be enabled
-	# this can lead to cases where two conflicting options are active, so we need to manually `set()` values OFF if they're not reached
-	# dependent options fix this, which is why they should be prioritised if available
+    # even if an `option()` isn't reached, if it's been reached in previous configurations then the old value still exists as a cache variable
+    # this means it can still be seen and edited by tools such as cmake-gui, without any indication that it's not meant to be enabled
+    # this can lead to cases where two conflicting options are active, so we need to manually `set()` values OFF if they're not reached
+    # dependent options fix this, which is why they should be prioritised if available
 
     if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
         option(MINIFB_BUILD_VERSION_INFO "Build version info utility" ON)
@@ -181,27 +181,27 @@ else()
     if (MACOS)
         option(MINIFB_USE_METAL_API "Build the project using Metal API code" ON)
         option(MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)" OFF)
-	else()
-		set(MINIFB_USE_METAL_API OFF)
-		set(MINIFB_USE_INVERTED_Y_ON_MACOS OFF)
-	endif()
+    else()
+        set(MINIFB_USE_METAL_API OFF)
+        set(MINIFB_USE_INVERTED_Y_ON_MACOS OFF)
+    endif()
 
     if (LINUX)
         option(MINIFB_USE_WAYLAND_API "Build the project using Wayland API code" OFF)
-	else()
-		set(MINIFB_USE_WAYLAND_API OFF)
-	endif()
+    else()
+        set(MINIFB_USE_WAYLAND_API OFF)
+    endif()
 
-	if (LINUX AND NOT MINIFB_USE_WAYLAND_API)
-		set(MINIFB_USE_X11_API ON)
-	else()
-		set(MINIFB_USE_X11_API OFF)
-	endif()
+    if (LINUX AND NOT MINIFB_USE_WAYLAND_API)
+        set(MINIFB_USE_X11_API ON)
+    else()
+        set(MINIFB_USE_X11_API OFF)
+    endif()
 
     if (WIN32 OR MINIFB_USE_X11_API)
-		option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
-	else()
-		set(MINIFB_USE_OPENGL_API OFF)
+        option(MINIFB_USE_OPENGL_API "Build the project using OpenGL API code" ON)
+    else()
+        set(MINIFB_USE_OPENGL_API OFF)
     endif()
 
 endif()

From 15f93860e7fe42e172183c04674348ea05443fe3 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Tue, 28 Apr 2026 12:03:15 +1000
Subject: [PATCH 10/31] clean cmake linking + fix macos

 - seperate opengl linking in the same way that it's seperated for source files
 - remove old ${X11_Xrandr_LIB} linking, the new X11::Xrandr was added in cmake 3.14, so we're guarenteed to have it
 - add a few additional comments

also fix macos source files not being added, which i accedently caused earlier on this branch
---
 CMakeLists.txt | 53 ++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1cc9c5..d5958cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,7 +335,7 @@ if (WIN32)
 elseif (IOS)
     target_sources(minifb PRIVATE ${SrcIOS})
 
-elseif (DARWIN)
+elseif (MACOS)
     target_sources(minifb PRIVATE ${SrcMacOS})
 
 elseif (MINIFB_USE_WAYLAND_API)
@@ -353,8 +353,21 @@ endif()
 
 # Link
 #--------------------------------------
-if (IOS)
+if (MINIFB_USE_OPENGL_API)
+    find_package(OpenGL)
+    if (NOT OpenGL_FOUND)
+        if (WIN32)
+            message(FATAL_ERROR "OpenGL not found for Windows; install the required SDK components")
+        elseif (MINIFB_USE_X11_API)
+            message(FATAL_ERROR "OpenGL development files not found (install OpenGL headers/libs, e.g. mesa-common-dev/libgl1-mesa-dev)")
+        endif()
+    endif()
+    target_link_libraries(minifb PRIVATE
+        OpenGL::GL
+    )
+endif()
 
+if (IOS)
     target_link_libraries(minifb PRIVATE
         "-framework UIKit"
         "-framework QuartzCore"
@@ -363,7 +376,7 @@ if (IOS)
     )
 
 elseif (MACOS)
-
+	# TODO: do we need to link cocoa if we're using metal, or metal if we're using cocoa?
     target_link_libraries(minifb PRIVATE
         "-framework Cocoa"
         "-framework QuartzCore"
@@ -372,7 +385,7 @@ elseif (MACOS)
     )
 
 elseif (MINIFB_USE_WAYLAND_API)
-
+	# wayland doesn't as of yet have a built-in cmake finder, so we use PkgConfig instead
     find_package(PkgConfig)
     if (NOT PKG_CONFIG_FOUND)
         message(FATAL_ERROR "pkg-config is required to locate Wayland development files")
@@ -390,31 +403,18 @@ elseif(MINIFB_USE_X11_API)
     if (NOT X11_FOUND)
         message(FATAL_ERROR "X11 development files not found (install X11 headers/libs, e.g. libx11-dev)")
     endif()
-
     target_link_libraries(minifb PRIVATE
         X11::X11
-        #"-lxkbcommon"
     )
+
     if (X11_Xrandr_FOUND)
-        if (TARGET X11::Xrandr)
-            target_link_libraries(minifb PRIVATE X11::Xrandr)
-        else()
-            target_link_libraries(minifb PRIVATE ${X11_Xrandr_LIB})
-        endif()
-        target_compile_definitions(minifb PRIVATE MINIFB_HAS_XRANDR)
-    endif()
-    if (MINIFB_USE_OPENGL_API)
-        find_package(OpenGL)
-        if (NOT OpenGL_FOUND)
-            message(FATAL_ERROR "OpenGL development files not found (install OpenGL headers/libs, e.g. mesa-common-dev/libgl1-mesa-dev)")
-        endif()
         target_link_libraries(minifb PRIVATE
-            OpenGL::GL
+            X11::Xrandr
         )
+        target_compile_definitions(minifb PRIVATE MINIFB_HAS_XRANDR)
     endif()
 
 elseif (EMSCRIPTEN)
-
     target_link_options(minifb INTERFACE
         "-sSTRICT=1"
         "-sENVIRONMENT=web"
@@ -431,19 +431,8 @@ elseif (EMSCRIPTEN)
     )
 
 elseif (WIN32)
-
-    if (MINIFB_USE_OPENGL_API)
-        find_package(OpenGL)
-        if (NOT OpenGL_FOUND)
-            message(FATAL_ERROR "OpenGL not found for Windows; install the required SDK components")
-        endif()
-        target_link_libraries(minifb PRIVATE
-            "opengl32.lib"
-        )
-    endif()
-
     target_link_libraries(minifb PRIVATE
-        "winmm.lib"
+        "winmm.lib"   # windows multimedia library, used in our case for precise timing
     )
 
 endif()

From e552b39e47156877dc6cbe20ea2d5af5a09db692 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Tue, 28 Apr 2026 12:11:36 +1000
Subject: [PATCH 11/31] cmake style unification

---
 CMakeLists.txt | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5958cd..0c8195e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,9 +219,7 @@ endif()
 
 # Create library target
 #--------------------------------------
-add_library(minifb STATIC
-    ${SrcLib}
-)
+add_library(minifb STATIC ${SrcLib})
 add_library(minifb::minifb ALIAS minifb)
 
 # Set features
@@ -362,9 +360,8 @@ if (MINIFB_USE_OPENGL_API)
             message(FATAL_ERROR "OpenGL development files not found (install OpenGL headers/libs, e.g. mesa-common-dev/libgl1-mesa-dev)")
         endif()
     endif()
-    target_link_libraries(minifb PRIVATE
-        OpenGL::GL
-    )
+
+    target_link_libraries(minifb PRIVATE OpenGL::GL)
 endif()
 
 if (IOS)
@@ -394,23 +391,17 @@ elseif (MINIFB_USE_WAYLAND_API)
 
     target_include_directories(minifb PRIVATE ${WAYLAND_INCLUDE_DIRS})
     target_link_directories(minifb PRIVATE ${WAYLAND_LIBRARY_DIRS})
-    target_link_libraries(minifb PRIVATE
-        ${WAYLAND_LIBRARIES}
-    )
+    target_link_libraries(minifb PRIVATE ${WAYLAND_LIBRARIES})
 
 elseif(MINIFB_USE_X11_API)
     find_package(X11)
     if (NOT X11_FOUND)
         message(FATAL_ERROR "X11 development files not found (install X11 headers/libs, e.g. libx11-dev)")
     endif()
-    target_link_libraries(minifb PRIVATE
-        X11::X11
-    )
+    target_link_libraries(minifb PRIVATE X11::X11)
 
     if (X11_Xrandr_FOUND)
-        target_link_libraries(minifb PRIVATE
-            X11::Xrandr
-        )
+        target_link_libraries(minifb PRIVATE X11::Xrandr)
         target_compile_definitions(minifb PRIVATE MINIFB_HAS_XRANDR)
     endif()
 
@@ -431,9 +422,7 @@ elseif (EMSCRIPTEN)
     )
 
 elseif (WIN32)
-    target_link_libraries(minifb PRIVATE
-        "winmm.lib"   # windows multimedia library, used in our case for precise timing
-    )
+    target_link_libraries(minifb PRIVATE "winmm.lib")  # windows multimedia library, used in our case for precise timing
 
 endif()
 
@@ -513,9 +502,7 @@ if (MINIFB_BUILD_EXAMPLES)
 
         if (DJGPP)
 
-            add_executable(debug_dos
-                examples/dos/debug_dos.c
-            )
+            add_executable(debug_dos examples/dos/debug_dos.c)
             list(APPEND MINIFB_EXAMPLE_TARGETS debug_dos)
 
         endif()
@@ -528,12 +515,8 @@ if (MINIFB_BUILD_EXAMPLES)
             examples/ios/AppDelegate.m
         )
 
-        add_executable(noise
-            ${IOS_NOISE_COMMON_SOURCES}
-        )
-        add_executable(noise_no_storyboard
-            ${IOS_NOISE_COMMON_SOURCES}
-        )
+        add_executable(noise ${IOS_NOISE_COMMON_SOURCES})
+        add_executable(noise_no_storyboard ${IOS_NOISE_COMMON_SOURCES})
         list(APPEND MINIFB_EXAMPLE_TARGETS noise noise_no_storyboard)
 
         set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Set CMake deployment target" ${FORCE_CACHE})

From c2ab28c881f062fc71d3c97112cdb5abf8b3de76 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 8 May 2026 09:27:36 +1000
Subject: [PATCH 12/31] clean dgjpp debugging options

previously would specifically specify to use dwarf debugging format on djgpp, despite it being the default for gcc either in djgpp or not
also removed -save-temps in the djgpp debug options, i couldn't find out a reason to use this specifically in djgpp.

regular gcc compilation and dos compilation are now identical in compile flags
---
 CMakeLists.txt | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c8195e..c94cc8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,17 +242,6 @@ if (NOT MSVC)
 
     # GCC/Clang
 
-    if (DJGPP)
-        target_compile_options(minifb PUBLIC
-            "$<$<CONFIG:Debug>:-gdwarf>"
-            "$<$<CONFIG:Debug>:-save-temps>"
-        )
-    else()
-        target_compile_options(minifb PUBLIC
-            "$<$<CONFIG:Debug>:-g>"
-        )
-    endif()
-
     target_compile_options(minifb PUBLIC
         -Wall
         -Wextra
@@ -261,6 +250,7 @@ if (NOT MSVC)
         -Wno-unused-parameter
         -Wno-implicit-fallthrough
         "$<IF:$<CONFIG:Debug>,-O0,-O2>"
+        "$<$<CONFIG:Debug>:-g>"
     )
 
 else()
@@ -373,7 +363,7 @@ if (IOS)
     )
 
 elseif (MACOS)
-	# TODO: do we need to link cocoa if we're using metal, or metal if we're using cocoa?
+    # TODO: do we need to link cocoa if we're using metal, or metal if we're using cocoa?
     target_link_libraries(minifb PRIVATE
         "-framework Cocoa"
         "-framework QuartzCore"
@@ -382,7 +372,7 @@ elseif (MACOS)
     )
 
 elseif (MINIFB_USE_WAYLAND_API)
-	# wayland doesn't as of yet have a built-in cmake finder, so we use PkgConfig instead
+    # wayland doesn't as of yet have a built-in cmake finder, so we use PkgConfig instead
     find_package(PkgConfig)
     if (NOT PKG_CONFIG_FOUND)
         message(FATAL_ERROR "pkg-config is required to locate Wayland development files")

From 562499103fbbb9eea2715bb2ccf5d7b6b48e8dbe Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Tue, 12 May 2026 14:50:23 +1000
Subject: [PATCH 13/31] clean cmake examples code

---
 CMakeLists.txt | 155 +++++++++++++++++--------------------------------
 1 file changed, 54 insertions(+), 101 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c94cc8f..f3ee64a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,7 +306,7 @@ if (MINIFB_USE_INVERTED_Y_ON_MACOS)
     target_compile_definitions(minifb PUBLIC USE_INVERTED_Y_ON_MACOS)
 endif()
 
-# Add GL/Metal code if we're using GL/Metal, no matter the backend
+# Add GL/Metal code if we're using GL/Metal, no matter the specific platform
 if (MINIFB_USE_OPENGL_API)
     target_sources(minifb PRIVATE ${SrcGL})
     target_compile_definitions(minifb PUBLIC USE_OPENGL_API)
@@ -317,7 +317,7 @@ if (MINIFB_USE_METAL_API)
 endif()
 
 if (WIN32)
-    target_compile_definitions(minifb PUBLIC _WIN32_WINNT=0x0601)  # Windows 7 (we are in 2026)
+    target_compile_definitions(minifb PUBLIC _WIN32_WINNT=0x0601)  # minimum supported version (and header version) = windows 7 (we are in 2026)
     target_sources(minifb PRIVATE ${SrcWindows})
 
 elseif (IOS)
@@ -433,136 +433,89 @@ target_include_directories(minifb PUBLIC
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 target_include_directories(minifb PRIVATE src)
 
+# example use: minifb_add_example(NAME noise SOURCE examples/noise.c)
+function(minifb_add_example)
+    cmake_parse_arguments(PARSE_ARGV 0 arg "IOS_STORYBOARD IOS_NO_STORYBOARD" "NAME" "SOURCE")
+
+    add_executable(${arg_NAME} ${arg_SOURCE})
+    target_link_libraries(${arg_NAME} PRIVATE minifb) # also configures compilation by the minifb target's PUBLIC properties
+
+    set_property(TARGET ${arg_NAME} PROPERTY FOLDER "Examples")
+    set_target_properties(${arg_NAME} PROPERTIES
+        C_STANDARD ${MINIFB_C_STANDARD}
+        C_STANDARD_REQUIRED ON
+        C_EXTENSIONS ${MINIFB_C_EXTENSIONS}
+        CXX_STANDARD ${MINIFB_CXX_STANDARD}
+        CXX_STANDARD_REQUIRED ON
+        CXX_EXTENSIONS ${MINIFB_CXX_EXTENSIONS}
+    )
+
+    # specific rules for building on specific platforms
+    if (EMSCRIPTEN)
+        target_link_options(${arg_NAME} PRIVATE "-sEXPORT_NAME=${arg_NAME}")
+
+    elseif (IOS)
+		# TODO: why do examples need to include internal headers?
+        target_include_directories(${arg_NAME} PRIVATE src src/ios)
+
+        if (IOS_STORYBOARD)
+            set_target_properties(${arg_NAME} PROPERTIES
+                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.plist"
+                RESOURCE "examples/ios/LaunchScreen.storyboard"
+            )
+        elseif (IOS_NO_STORYBOARD)
+            set_target_properties(${arg_NAME} PROPERTIES
+                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.no_storyboard.plist"
+            )
+        endif()
+    endif()
+endfunction()
+
 # Other targets
 #--------------------------------------
-set(MINIFB_EXAMPLE_TARGETS)
-
 if (MINIFB_BUILD_VERSION_INFO)
-    add_executable(minifb_version_info examples/version_info.c)
-    list(APPEND MINIFB_EXAMPLE_TARGETS minifb_version_info)
+	minifb_add_example(NAME minifb_version_info SOURCE examples/version_info.c)
 endif()
 
 # Examples
 #--------------------------------------
-# TODO: clean up further
 if (MINIFB_BUILD_EXAMPLES)
     if (NOT IOS)
-
-        add_executable(noise examples/noise.c)
-        add_executable(input_events examples/input_events.c)
-        add_executable(input_events_cpp examples/input_events_cpp.cpp)
-        add_executable(multiple_windows examples/multiple_windows.c)
-        add_executable(hidpi examples/hidpi.c)
-        add_executable(fullscreen examples/fullscreen.c)
-        add_executable(timer examples/timer.c)
-        add_executable(hide_cursor examples/hide_cursor.c)
-
-        list(APPEND MINIFB_EXAMPLE_TARGETS
-            noise
-            input_events
-            input_events_cpp
-            multiple_windows
-            hidpi
-            fullscreen
-            timer
-            hide_cursor
-        )
-
-        if (EMSCRIPTEN)
-
-            add_custom_target(web_assets
-                COMMAND ${CMAKE_COMMAND} -E copy_directory
-                    ${CMAKE_CURRENT_SOURCE_DIR}/examples/web
-                    ${CMAKE_CURRENT_BINARY_DIR}
-            )
-
-            add_dependencies(noise web_assets)
-            add_dependencies(input_events web_assets)
-            add_dependencies(hidpi web_assets)
-            add_dependencies(multiple_windows web_assets)
-            add_dependencies(timer web_assets)
-
-            target_link_options(noise PRIVATE "-sEXPORT_NAME=noise")
-            target_link_options(input_events PRIVATE "-sEXPORT_NAME=input_events")
-            target_link_options(hidpi PRIVATE "-sEXPORT_NAME=hidpi")
-            target_link_options(multiple_windows PRIVATE "-sEXPORT_NAME=multiple_windows")
-            target_link_options(timer PRIVATE "-sEXPORT_NAME=timer")
-
+        minifb_add_example(NAME noise                SOURCE examples/noise.c)
+        minifb_add_example(NAME input_events         SOURCE examples/input_events.c)
+        minifb_add_example(NAME hidpi                SOURCE examples/hidpi.c)
+        minifb_add_example(NAME multiple_windows     SOURCE examples/multiple_windows.c)
+        minifb_add_example(NAME timer                SOURCE examples/timer.c)
+        if (NOT EMSCRIPTEN)
+            minifb_add_example(NAME fullscreen       SOURCE examples/fullscreen.c)
+            minifb_add_example(NAME hide_cursor      SOURCE examples/hide_cursor.c)
+            minifb_add_example(NAME input_events_cpp SOURCE examples/input_events_cpp.cpp)
         endif()
-
         if (DJGPP)
-
-            add_executable(debug_dos examples/dos/debug_dos.c)
-            list(APPEND MINIFB_EXAMPLE_TARGETS debug_dos)
-
+            minifb_add_example(NAME debug_dos        SOURCE examples/dos/debug_dos.c)
         endif()
 
     else() # iOS
-
         set(IOS_NOISE_COMMON_SOURCES
             examples/ios/main.m
             examples/ios/AppDelegate.h
             examples/ios/AppDelegate.m
         )
 
-        add_executable(noise ${IOS_NOISE_COMMON_SOURCES})
-        add_executable(noise_no_storyboard ${IOS_NOISE_COMMON_SOURCES})
-        list(APPEND MINIFB_EXAMPLE_TARGETS noise noise_no_storyboard)
+        minifb_add_example(NAME noise               SOURCE ${IOS_NOISE_COMMON_SOURCES} IOS_STORYBOARD)
+        minifb_add_example(NAME noise_no_storyboard SOURCE ${IOS_NOISE_COMMON_SOURCES} IOS_NO_STORYBOARD)
 
+        # TODO: this is an IOS build, why do we need to set a minimum macos version?
         set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Set CMake deployment target" ${FORCE_CACHE})
 
-        foreach(ios_noise_target IN ITEMS noise noise_no_storyboard)
-            target_include_directories(${ios_noise_target} PRIVATE src)
-            target_include_directories(${ios_noise_target} PRIVATE src/ios)
-        endforeach()
-
-        set_target_properties(noise PROPERTIES
-            MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.plist"
-            RESOURCE "examples/ios/LaunchScreen.storyboard"
-        )
-        set_target_properties(noise_no_storyboard PROPERTIES
-            MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.no_storyboard.plist"
-        )
-
     endif()
-
 endif()
 
-# Add options to targets
-#--------------------------------------
-foreach(minifb_test_target IN LISTS MINIFB_EXAMPLE_TARGETS)
-    target_link_libraries(${minifb_test_target} PRIVATE minifb)
-
-    set_target_properties(${minifb_test_target} PROPERTIES
-        C_STANDARD ${MINIFB_C_STANDARD}
-        C_STANDARD_REQUIRED ON
-        C_EXTENSIONS ${MINIFB_C_EXTENSIONS}
-        CXX_STANDARD ${MINIFB_CXX_STANDARD}
-        CXX_STANDARD_REQUIRED ON
-        CXX_EXTENSIONS ${MINIFB_CXX_EXTENSIONS}
-    )
-endforeach()
-
 # Organize IDE Folders
 #--------------------------------------
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(TARGET minifb PROPERTY FOLDER "Libs")
 
-if (MINIFB_BUILD_EXAMPLES AND NOT IOS)
-    set_property(TARGET noise PROPERTY FOLDER "Examples")
-    set_property(TARGET timer PROPERTY FOLDER "Examples")
-    set_property(TARGET fullscreen PROPERTY FOLDER "Examples")
-    set_property(TARGET input_events PROPERTY FOLDER "Examples")
-    set_property(TARGET input_events_cpp PROPERTY FOLDER "Examples")
-    set_property(TARGET multiple_windows PROPERTY FOLDER "Examples")
-    set_property(TARGET hidpi PROPERTY FOLDER "Examples")
-    set_property(TARGET hide_cursor PROPERTY FOLDER "Examples")
-endif()
-
-if (MINIFB_BUILD_VERSION_INFO)
-    set_property(TARGET minifb_version_info PROPERTY FOLDER "Examples")
-endif()
-
 #--------------------------------------
 install(TARGETS minifb EXPORT minifb)
 install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/"

From 53ba267261b8e7182781f09ee2f9ccc1df45d2b0 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 14 May 2026 09:17:39 +1000
Subject: [PATCH 14/31] fix ios examples

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3ee64a..fad32e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -458,12 +458,12 @@ function(minifb_add_example)
 		# TODO: why do examples need to include internal headers?
         target_include_directories(${arg_NAME} PRIVATE src src/ios)
 
-        if (IOS_STORYBOARD)
+        if (${arg_IOS_STORYBOARD})
             set_target_properties(${arg_NAME} PROPERTIES
                 MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.plist"
                 RESOURCE "examples/ios/LaunchScreen.storyboard"
             )
-        elseif (IOS_NO_STORYBOARD)
+        elseif (${arg_IOS_NO_STORYBOARD})
             set_target_properties(${arg_NAME} PROPERTIES
                 MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.no_storyboard.plist"
             )

From 83bf7fb32a6e5b311f2b905be4ae9dcfadda8aee Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 14 May 2026 09:41:17 +1000
Subject: [PATCH 15/31] fix formatting

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fad32e6..e45c37a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -455,7 +455,7 @@ function(minifb_add_example)
         target_link_options(${arg_NAME} PRIVATE "-sEXPORT_NAME=${arg_NAME}")
 
     elseif (IOS)
-		# TODO: why do examples need to include internal headers?
+        # TODO: why do examples need to include internal headers?
         target_include_directories(${arg_NAME} PRIVATE src src/ios)
 
         if (${arg_IOS_STORYBOARD})
@@ -474,7 +474,7 @@ endfunction()
 # Other targets
 #--------------------------------------
 if (MINIFB_BUILD_VERSION_INFO)
-	minifb_add_example(NAME minifb_version_info SOURCE examples/version_info.c)
+    minifb_add_example(NAME minifb_version_info SOURCE examples/version_info.c)
 endif()
 
 # Examples

From 00e155ef0a5eb4d91b48523e9b82070f8a14a192 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Mon, 25 May 2026 00:38:26 +1000
Subject: [PATCH 16/31] fix emscripten cmake

- apply link options correctly
- stop unnececarily applying the -g flag in debug mode (as of my testing, it's applied automatically by the toolchain when release type is set to debug)
---
 CMakeLists.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e45c37a..b5aa76b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,13 +292,6 @@ target_compile_definitions(minifb PUBLIC
     "$<$<CONFIG:Debug>:DEBUG>"
 )
 
-# TODO: does the toolchain include this automatically?
-if (EMSCRIPTEN)
-    target_link_options(minifb INTERFACE
-        "$<$<CONFIG:Debug>:-g>"
-    )
-endif()
-
 # Set platform specific flags and source files
 #--------------------------------------
 
@@ -396,7 +389,7 @@ elseif(MINIFB_USE_X11_API)
     endif()
 
 elseif (EMSCRIPTEN)
-    target_link_options(minifb INTERFACE
+    target_link_options(minifb PRIVATE
         "-sSTRICT=1"
         "-sENVIRONMENT=web"
         "-sMODULARIZE=1"

From 6b93d644c1828b9f2ddd0e5839c0d57b9e2335ae Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 31 Jul 2026 09:30:12 +1000
Subject: [PATCH 17/31] cmake restructure

- rather then configuring examples with the main library target's PUBLIC
  properties, cmake now uses a function applied to all targets to
  configure them (as to not affect user targets)
- split the file into better defined "sections"
---
 CMakeLists.txt | 204 +++++++++++++++++++++++--------------------------
 1 file changed, 97 insertions(+), 107 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3348137..ffab9c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.16)
 project(MiniFB VERSION 0.10.1 LANGUAGES C CXX)
 
+message(STATUS "Processing " ${PROJECT_NAME})
+
+# CMake configuration
+#--------------------------------------
+
 # prefer these over general `UNIX` or `APPLE`
 # `UNIX` also overlaps MacOS, iOS, and Emscripten, which we don't want
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -17,8 +22,6 @@ if (MACOS OR IOS)
     endif()
 endif()
 
-message(STATUS "Processing " ${PROJECT_NAME})
-
 include(GNUInstallDirs)
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/versioning.cmake")
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/minifb_cmake_helpers.cmake")
@@ -27,6 +30,9 @@ if (POLICY CMP0072)
 endif()
 set(OpenGL_GL_PREFERENCE "GLVND")
 
+# use IDE folders in build systems that support it. enabled by default in cmake 3.26+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 minifb_compute_git_metadata(
     MINIFB_COMMITS_SINCE_TAG
     MINIFB_COMMIT_COUNT
@@ -138,7 +144,7 @@ option(MINIFB_AVOID_CPP_HEADERS "Avoid including C++ Headers" FALSE)
 # purely for internal use, never exposed to the user
 set(MINIFB_USE_X11_API OFF)
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.22) 
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
 
     # requires 3.22+ to use full condition syntax, technically could use in 3.16, but it would be a lot worse
     include(CMakeDependentOption)
@@ -217,100 +223,113 @@ elseif (WIN32)
     minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
 endif()
 
-# Create library target
+# Compilation configuration (library and examples)
 #--------------------------------------
-add_library(minifb STATIC ${SrcLib})
-add_library(minifb::minifb ALIAS minifb)
+function(minifb_configure_target target)
+    if (NOT MSVC)
+        # GCC/Clang
+        target_compile_options(${target} PRIVATE
+            -Wall
+            -Wextra
+            -Wno-switch
+            -Wno-unused-function
+            -Wno-unused-parameter
+            -Wno-implicit-fallthrough
+            "$<IF:$<CONFIG:Debug>,-O0,-O2>"
+            "$<$<CONFIG:Debug>:-g>"
+        )
 
-# Set features
-#--------------------------------------
-set(MINIFB_C_STANDARD 11)
-set(MINIFB_CXX_STANDARD 11)
+    else()
+        # MSVC
+        target_compile_options(${target} PRIVATE
+            # Security check
+            /GS
+            # Function level linking
+            /Gy
+            # Exceptions
+            /EHsc
+            # Fast floating point maths
+            /fp:fast
+            # Force Visual Studio to actualize __cplusplus version macro
+            /Zc:__cplusplus
+            # Additional security checks
+            /sdl
+
+            # Program database (edit and continue in debug mode)
+            "$<IF:$<CONFIG:Debug>,/ZI,/Zi>"
+            # Optimizations
+            "$<IF:$<CONFIG:Debug>,/Od,/O2>"
+            # Inline function expansion
+            "$<IF:$<CONFIG:Debug>,/Ob0,/Ob2>"
+            # Basic runtime checks
+            "$<$<CONFIG:Debug>:/RTC1>"
+        )
 
-if (DJGPP)
-    # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
-    set(MINIFB_C_EXTENSIONS   ON)
-    set(MINIFB_CXX_EXTENSIONS ON)
-else()
-    set(MINIFB_C_EXTENSIONS   OFF)
-    set(MINIFB_CXX_EXTENSIONS OFF)
-endif()
+        # prevent annoying c standard lib unsafety msvc warnings
+        target_compile_definitions(${target} PRIVATE _CRT_SECURE_NO_WARNINGS)
+    endif()
 
-# Set compile flags depending on the compiler
-#--------------------------------------
-if (NOT MSVC)
-
-    # GCC/Clang
-
-    target_compile_options(minifb PUBLIC
-        -Wall
-        -Wextra
-        -Wno-switch
-        -Wno-unused-function
-        -Wno-unused-parameter
-        -Wno-implicit-fallthrough
-        "$<IF:$<CONFIG:Debug>,-O0,-O2>"
-        "$<$<CONFIG:Debug>:-g>"
+    target_compile_definitions(${target} PRIVATE
+        "$<$<CONFIG:Debug>:_DEBUG>"
+        "$<$<CONFIG:Debug>:DEBUG>"
     )
 
-else()
+    if (WIN32)
+        target_compile_definitions(${target} PRIVATE _WIN32_WINNT=0x0601)  # minimum supported version (and header version) = windows 7 (we are in 2026)
+    endif()
+
+    # TODO does this even matter
+    if (DJGPP)
+        # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
+        set(MINIFB_C_EXTENSIONS   ON)
+        set(MINIFB_CXX_EXTENSIONS ON)
+    else()
+        set(MINIFB_C_EXTENSIONS   OFF)
+        set(MINIFB_CXX_EXTENSIONS OFF)
+    endif()
 
-    # MSVC
-    #--------------------------------------
-
-    target_compile_options(minifb PUBLIC
-        # Security check
-        /GS
-        # Function level linking
-        /Gy
-        # Exceptions
-        /EHsc
-        # Fast floating point maths
-        /fp:fast
-        # Force Visual Studio to actualize __cplusplus version macro
-        /Zc:__cplusplus
-        # Additional security checks
-        /sdl
-
-        # Program database (edit and continue in debug mode)
-        "$<IF:$<CONFIG:Debug>,/ZI,/Zi>"
-        # Optimizations
-        "$<IF:$<CONFIG:Debug>,/Od,/O2>"
-        # Inline function expansion
-        "$<IF:$<CONFIG:Debug>,/Ob0,/Ob2>"
-        # Basic runtime checks
-        "$<$<CONFIG:Debug>:/RTC1>"
+    set_target_properties(${target} PROPERTIES
+        C_STANDARD 11
+        C_STANDARD_REQUIRED ON
+        C_EXTENSIONS ${MINIFB_C_EXTENSIONS}
+        CXX_STANDARD 11
+        CXX_STANDARD_REQUIRED ON
+        CXX_EXTENSIONS ${MINIFB_CXX_EXTENSIONS}
     )
 
-    # prevent annoying c standard lib unsafety msvc warnings
-    target_compile_definitions(minifb PUBLIC _CRT_SECURE_NO_WARNINGS)
+endfunction()
 
-endif()
+# Create library target and configure
+#--------------------------------------
+add_library(minifb STATIC ${SrcLib})
+add_library(minifb::minifb ALIAS minifb)
 
-target_compile_definitions(minifb PUBLIC
-    "$<$<CONFIG:Debug>:_DEBUG>"
-    "$<$<CONFIG:Debug>:DEBUG>"
-)
+set_property(TARGET minifb PROPERTY FOLDER "Libs")
+minifb_configure_target(minifb)
 
-# Set platform specific flags and source files
-#--------------------------------------
+target_include_directories(minifb PUBLIC
+    $<BUILD_INTERFACE:${MINIFB_GENERATED_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+target_include_directories(minifb PRIVATE src)  # include internal headers
 
+# conditional configuration
 if (MINIFB_USE_INVERTED_Y_ON_MACOS)
-    target_compile_definitions(minifb PUBLIC USE_INVERTED_Y_ON_MACOS)
+    target_compile_definitions(minifb PRIVATE USE_INVERTED_Y_ON_MACOS)
 endif()
 
 # Add GL/Metal code if we're using GL/Metal, no matter the specific platform
 if (MINIFB_USE_OPENGL_API)
     target_sources(minifb PRIVATE ${SrcGL})
-    target_compile_definitions(minifb PUBLIC USE_OPENGL_API)
+    target_compile_definitions(minifb PRIVATE USE_OPENGL_API)
 endif()
 if (MINIFB_USE_METAL_API)
-    target_compile_definitions(minifb PUBLIC USE_METAL_API)
+    target_compile_definitions(minifb PRIVATE USE_METAL_API)
     target_sources(minifb PRIVATE ${SrcMacOSMetal})
 endif()
 
 if (WIN32)
-    target_compile_definitions(minifb PUBLIC _WIN32_WINNT=0x0601)  # minimum supported version (and header version) = windows 7 (we are in 2026)
     target_sources(minifb PRIVATE ${SrcWindows})
 
 elseif (IOS)
@@ -332,7 +351,7 @@ elseif (DJGPP)
     target_sources(minifb PRIVATE ${SrcDOS})
 endif()
 
-# Link
+# Linking main library
 #--------------------------------------
 if (MINIFB_USE_OPENGL_API)
     find_package(OpenGL)
@@ -409,41 +428,20 @@ elseif (WIN32)
 
 endif()
 
-# For all projects
+# Examples and other targets
 #--------------------------------------
-set_target_properties(minifb PROPERTIES
-    C_STANDARD ${MINIFB_C_STANDARD}
-    C_STANDARD_REQUIRED ON
-    C_EXTENSIONS ${MINIFB_C_EXTENSIONS}
-    CXX_STANDARD ${MINIFB_CXX_STANDARD}
-    CXX_STANDARD_REQUIRED ON
-    CXX_EXTENSIONS ${MINIFB_CXX_EXTENSIONS}
-)
-
-target_include_directories(minifb PUBLIC
-    $<BUILD_INTERFACE:${MINIFB_GENERATED_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_include_directories(minifb PRIVATE src)
 
 # example use: minifb_add_example(NAME noise SOURCE examples/noise.c)
 function(minifb_add_example)
     cmake_parse_arguments(PARSE_ARGV 0 arg "IOS_STORYBOARD IOS_NO_STORYBOARD" "NAME" "SOURCE")
 
     add_executable(${arg_NAME} ${arg_SOURCE})
-    target_link_libraries(${arg_NAME} PRIVATE minifb) # also configures compilation by the minifb target's PUBLIC properties
+    target_link_libraries(${arg_NAME} PRIVATE minifb)
+    minifb_configure_target(${arg_NAME})
 
     set_property(TARGET ${arg_NAME} PROPERTY FOLDER "Examples")
-    set_target_properties(${arg_NAME} PROPERTIES
-        C_STANDARD ${MINIFB_C_STANDARD}
-        C_STANDARD_REQUIRED ON
-        C_EXTENSIONS ${MINIFB_C_EXTENSIONS}
-        CXX_STANDARD ${MINIFB_CXX_STANDARD}
-        CXX_STANDARD_REQUIRED ON
-        CXX_EXTENSIONS ${MINIFB_CXX_EXTENSIONS}
-    )
 
-    # specific rules for building on specific platforms
+    # conditional configuration
     if (EMSCRIPTEN)
         target_link_options(${arg_NAME} PRIVATE "-sEXPORT_NAME=${arg_NAME}")
 
@@ -464,14 +462,10 @@ function(minifb_add_example)
     endif()
 endfunction()
 
-# Other targets
-#--------------------------------------
 if (MINIFB_BUILD_VERSION_INFO)
     minifb_add_example(NAME minifb_version_info SOURCE examples/version_info.c)
 endif()
 
-# Examples
-#--------------------------------------
 if (MINIFB_BUILD_EXAMPLES)
     if (NOT IOS)
         minifb_add_example(NAME noise                SOURCE examples/noise.c)
@@ -504,11 +498,7 @@ if (MINIFB_BUILD_EXAMPLES)
     endif()
 endif()
 
-# Organize IDE Folders
-#--------------------------------------
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set_property(TARGET minifb PROPERTY FOLDER "Libs")
-
+# Configure installation
 #--------------------------------------
 install(TARGETS minifb EXPORT minifb)
 install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/"

From 290cf4e9bd5825abb85faa9f110e5f7bd0ee25c3 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 31 Jul 2026 13:18:40 +1000
Subject: [PATCH 18/31] fix emscripten in cmake

---
 CMakeLists.txt | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffab9c2..68de336 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -408,20 +408,7 @@ elseif(MINIFB_USE_X11_API)
     endif()
 
 elseif (EMSCRIPTEN)
-    target_link_options(minifb PRIVATE
-        "-sSTRICT=1"
-        "-sENVIRONMENT=web"
-        "-sMODULARIZE=1"
-        "-sALLOW_MEMORY_GROWTH=1"
-        "-sALLOW_TABLE_GROWTH"
-        "-sMALLOC=emmalloc"
-        "-sEXPORT_ALL=1"
-        "-sEXPORTED_FUNCTIONS=[\"_malloc\",\"_free\",\"_main\"]"
-        "-sEXPORTED_RUNTIME_METHODS=ccall,cwrap"
-        "-sASYNCIFY"
-        "--no-entry"
-        "-sSINGLE_FILE"
-    )
+    # emscripten has no dedicated linking code
 
 elseif (WIN32)
     target_link_libraries(minifb PRIVATE "winmm.lib")  # windows multimedia library, used in our case for precise timing
@@ -443,7 +430,21 @@ function(minifb_add_example)
 
     # conditional configuration
     if (EMSCRIPTEN)
-        target_link_options(${arg_NAME} PRIVATE "-sEXPORT_NAME=${arg_NAME}")
+        target_link_options(${arg_NAME} PRIVATE
+            "-sEXPORT_NAME=${arg_NAME}"
+            "-sSTRICT=1"
+            "-sENVIRONMENT=web"
+            "-sMODULARIZE=1"
+            "-sALLOW_MEMORY_GROWTH=1"
+            "-sALLOW_TABLE_GROWTH"
+            "-sMALLOC=emmalloc"
+            "-sEXPORT_ALL=1"
+            "-sEXPORTED_FUNCTIONS=[\"_malloc\",\"_free\",\"_main\"]"
+            "-sEXPORTED_RUNTIME_METHODS=ccall,cwrap"
+            "-sASYNCIFY"
+            "--no-entry"
+            "-sSINGLE_FILE"
+        )
 
     elseif (IOS)
         # TODO: why do examples need to include internal headers?

From 33d88cf6a063884d16b6e0c9b0fb9380284baf29 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 31 Jul 2026 15:03:33 +1000
Subject: [PATCH 19/31] fix emscripten examples again

after each individual example builds, it'll copy the html file into the
build.
---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68de336..32e9b3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,6 +446,12 @@ function(minifb_add_example)
             "-sSINGLE_FILE"
         )
 
+        add_custom_command(TARGET ${arg_NAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+                "${CMAKE_CURRENT_SOURCE_DIR}/examples/web/${arg_NAME}.html"
+                "${CMAKE_CURRENT_BINARY_DIR}"
+            )
+
     elseif (IOS)
         # TODO: why do examples need to include internal headers?
         target_include_directories(${arg_NAME} PRIVATE src src/ios)

From 6d5e89ff35e310c0529f69b88067b5601143779f Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 6 Aug 2026 00:10:16 +1000
Subject: [PATCH 20/31] simplify and comment cmake header generation

---
 CMakeLists.txt              | 24 ++++++++++++++++--------
 cmake/versioning.cmake      |  5 -----
 include/minifb_version.h.in |  2 ++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32e9b3c..8db23d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,18 +33,21 @@ set(OpenGL_GL_PREFERENCE "GLVND")
 # use IDE folders in build systems that support it. enabled by default in cmake 3.26+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+# directory to add generated headers (created during configuration)
+set(MINIFB_GENERATED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+file(MAKE_DIRECTORY "${output_dir}")
+
+# generate the version header from the templace (.in)
 minifb_compute_git_metadata(
     MINIFB_COMMITS_SINCE_TAG
     MINIFB_COMMIT_COUNT
     MINIFB_GIT_SHA
     MINIFB_GIT_DIRTY
 )
-
-set(MINIFB_GENERATED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
-minifb_configure_version_header(
+configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/include/minifb_version.h.in"
-    "${MINIFB_GENERATED_INCLUDE_DIR}"
     "${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h"
+    @ONLY
 )
 
 # Sources
@@ -57,6 +60,9 @@ set(SrcLib
     include/MiniFB_macros.h
     include/MiniFB_types.h
 
+	# remember to include generated headers as source files
+	${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h
+
     src/MiniFB_common.c
     src/MiniFB_cpp.cpp
     src/MiniFB_internal.c
@@ -307,14 +313,16 @@ add_library(minifb::minifb ALIAS minifb)
 set_property(TARGET minifb PROPERTY FOLDER "Libs")
 minifb_configure_target(minifb)
 
+# headers required for users (differs depending on if it's been built or installed)
 target_include_directories(minifb PUBLIC
-    $<BUILD_INTERFACE:${MINIFB_GENERATED_INCLUDE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>  # most headers
+    $<BUILD_INTERFACE:${MINIFB_GENERATED_INCLUDE_DIR}>    # auto-generated headers
+	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)     # (both of those are in the same location if installed)
 
 target_include_directories(minifb PRIVATE src)  # include internal headers
 
-# conditional configuration
+# conditional main library target configuration
+
 if (MINIFB_USE_INVERTED_Y_ON_MACOS)
     target_compile_definitions(minifb PRIVATE USE_INVERTED_Y_ON_MACOS)
 endif()
diff --git a/cmake/versioning.cmake b/cmake/versioning.cmake
index 4025172..c576af8 100644
--- a/cmake/versioning.cmake
+++ b/cmake/versioning.cmake
@@ -45,11 +45,6 @@ function(minifb_compute_git_metadata out_commits_since_tag out_commit_count out_
     set(${out_git_dirty} "${_git_dirty}" PARENT_SCOPE)
 endfunction()
 
-function(minifb_configure_version_header template_path output_dir output_path)
-    file(MAKE_DIRECTORY "${output_dir}")
-    configure_file("${template_path}" "${output_path}" @ONLY)
-endfunction()
-
 function(minifb_write_package_version_file output_path)
     include(CMakePackageConfigHelpers)
     write_basic_package_version_file(
diff --git a/include/minifb_version.h.in b/include/minifb_version.h.in
index 4d4e218..8380d75 100644
--- a/include/minifb_version.h.in
+++ b/include/minifb_version.h.in
@@ -1,5 +1,7 @@
 #pragma once
 
+// filled by CMake
+
 #include <stdint.h>
 
 #define MINIFB_VERSION_MAJOR @PROJECT_VERSION_MAJOR@

From 4c2c632f518675c3d16833fa58e84a06e4f25123 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 6 Aug 2026 23:43:38 +1000
Subject: [PATCH 21/31] simplify and comment installation code

it was somewhat unnececary (and less clear as to what it was actually
doing) to have seperate functions for cmake installation
---
 CMakeLists.txt               | 32 +++++++++++++++++++++-----------
 cmake/minifb-config.cmake.in |  7 +++++--
 cmake/versioning.cmake       | 18 ------------------
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8db23d1..3701519 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -515,28 +515,38 @@ endif()
 
 # Configure installation
 #--------------------------------------
+
+# install the library, and all headers
 install(TARGETS minifb EXPORT minifb)
-install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/"
+install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/" "${MINIFB_GENERATED_INCLUDE_DIR}"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-    FILES_MATCHING
-    PATTERN "*.h"
-    PATTERN "*.hpp"
+    FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
 )
-install(FILES "${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
+# generate and install files required to find_package minifb
+include(CMakePackageConfigHelpers)
 set(MINIFB_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/minifb")
 
-minifb_configure_package_config_file(
+# generate the cmake code that will create the minifb:: target when found, to minifb-targets.cmake
+install(EXPORT minifb
+    FILE minifb-targets.cmake
+    DESTINATION "${MINIFB_CMAKE_CONFIG_INSTALL_DIR}"
+    NAMESPACE minifb::
+)
+
+# generate file from our template that will be found directly by find_package (<name>-config.cmake is one of file filenames it searches for)
+# the file will find dependancies and `include`s the previously created minifb-targets.cmake
+configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/minifb-config.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/minifb-config.cmake"
-    "${MINIFB_CMAKE_CONFIG_INSTALL_DIR}"
+    INSTALL_DESTINATION "${MINIFB_CMAKE_CONFIG_INSTALL_DIR}"
 )
-
-minifb_write_package_version_file(
+# in case find_package is called with the VERSION flag, generate the file that checks the version
+write_basic_package_version_file(
     "${CMAKE_CURRENT_BINARY_DIR}/minifb-config-version.cmake"
+    COMPATIBILITY SameMajorVersion
 )
-
-install(EXPORT minifb FILE minifb-targets.cmake DESTINATION "${MINIFB_CMAKE_CONFIG_INSTALL_DIR}" NAMESPACE minifb::)
+# install the previous two files
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/minifb-config.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/minifb-config-version.cmake"
diff --git a/cmake/minifb-config.cmake.in b/cmake/minifb-config.cmake.in
index 79aff2b..53e6a19 100644
--- a/cmake/minifb-config.cmake.in
+++ b/cmake/minifb-config.cmake.in
@@ -1,15 +1,18 @@
 @PACKAGE_INIT@
 
-include(CMakeFindDependencyMacro)
+# filled and installed by cmake
+# once filled, this file will be found by find_package
 
+# depending on the configuration minifb was built with, make sure it has the required dependencies
+include(CMakeFindDependencyMacro)
 if(@MINIFB_PACKAGE_FIND_OPENGL@)
     find_dependency(OpenGL)
 endif()
-
 if(@MINIFB_PACKAGE_FIND_X11@)
     find_dependency(X11)
 endif()
 
+# run the auto-generated file to create the exported minifb:: target
 include("${CMAKE_CURRENT_LIST_DIR}/minifb-targets.cmake")
 
 check_required_components(minifb)
diff --git a/cmake/versioning.cmake b/cmake/versioning.cmake
index c576af8..2a4d216 100644
--- a/cmake/versioning.cmake
+++ b/cmake/versioning.cmake
@@ -44,21 +44,3 @@ function(minifb_compute_git_metadata out_commits_since_tag out_commit_count out_
     set(${out_git_sha} "${_git_sha}" PARENT_SCOPE)
     set(${out_git_dirty} "${_git_dirty}" PARENT_SCOPE)
 endfunction()
-
-function(minifb_write_package_version_file output_path)
-    include(CMakePackageConfigHelpers)
-    write_basic_package_version_file(
-        "${output_path}"
-        VERSION "${PROJECT_VERSION}"
-        COMPATIBILITY SameMajorVersion
-    )
-endfunction()
-
-function(minifb_configure_package_config_file input_path output_path install_destination)
-    include(CMakePackageConfigHelpers)
-    configure_package_config_file(
-        "${input_path}"
-        "${output_path}"
-        INSTALL_DESTINATION "${install_destination}"
-    )
-endfunction()

From 2383098675731bb9af0763c41822c6a5bf169cd2 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 6 Aug 2026 23:47:39 +1000
Subject: [PATCH 22/31] move cmake vs_startup_project

---
 CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3701519..c5d98e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -511,6 +511,9 @@ if (MINIFB_BUILD_EXAMPLES)
         set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Set CMake deployment target" ${FORCE_CACHE})
 
     endif()
+
+	# example that will be ran on actions such as f5 in visual studio
+    set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT noise)
 endif()
 
 # Configure installation
@@ -553,8 +556,4 @@ install(FILES
     DESTINATION "${MINIFB_CMAKE_CONFIG_INSTALL_DIR}"
 )
 
-if (MSVC AND MINIFB_BUILD_EXAMPLES)
-    set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT noise)
-endif()
-
 message(STATUS "Done " ${PROJECT_NAME})

From 7527b62c30468bfdbf44abff7ce3131e2bea6438 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 6 Aug 2026 23:49:17 +1000
Subject: [PATCH 23/31] fix formatting

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5d98e4..50c2771 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,8 @@ set(SrcLib
     include/MiniFB_macros.h
     include/MiniFB_types.h
 
-	# remember to include generated headers as source files
-	${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h
+    # remember to include generated headers as source files
+    ${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h
 
     src/MiniFB_common.c
     src/MiniFB_cpp.cpp
@@ -317,7 +317,7 @@ minifb_configure_target(minifb)
 target_include_directories(minifb PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>  # most headers
     $<BUILD_INTERFACE:${MINIFB_GENERATED_INCLUDE_DIR}>    # auto-generated headers
-	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)     # (both of those are in the same location if installed)
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)     # (both of those are in the same location if installed)
 
 target_include_directories(minifb PRIVATE src)  # include internal headers
 
@@ -512,7 +512,7 @@ if (MINIFB_BUILD_EXAMPLES)
 
     endif()
 
-	# example that will be ran on actions such as f5 in visual studio
+    # example that will be ran on actions such as f5 in visual studio
     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT noise)
 endif()
 

From 33a08e4db0fbe2e1324f33789c6f66db5c78c7ec Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Thu, 6 Aug 2026 23:54:28 +1000
Subject: [PATCH 24/31] fix cmake find_package configuration

---
 cmake/minifb-config.cmake.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/minifb-config.cmake.in b/cmake/minifb-config.cmake.in
index 53e6a19..e853fcd 100644
--- a/cmake/minifb-config.cmake.in
+++ b/cmake/minifb-config.cmake.in
@@ -5,10 +5,10 @@
 
 # depending on the configuration minifb was built with, make sure it has the required dependencies
 include(CMakeFindDependencyMacro)
-if(@MINIFB_PACKAGE_FIND_OPENGL@)
+if(@MINIFB_USE_OPENGL_API@)
     find_dependency(OpenGL)
 endif()
-if(@MINIFB_PACKAGE_FIND_X11@)
+if(@MINIFB_USE_X11_API@)
     find_dependency(X11)
 endif()
 

From a6a068f4b66f12b770d3b1a287b24664fb06d33a Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 7 Aug 2026 10:58:33 +1000
Subject: [PATCH 25/31] remove todo

as it turns out, it does matter
---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50c2771..8815dbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,9 +284,8 @@ function(minifb_configure_target target)
         target_compile_definitions(${target} PRIVATE _WIN32_WINNT=0x0601)  # minimum supported version (and header version) = windows 7 (we are in 2026)
     endif()
 
-    # TODO does this even matter
+    # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
     if (DJGPP)
-        # DJGPP headers expose key DOS APIs only in GNU (non-strict ANSI) mode.
         set(MINIFB_C_EXTENSIONS   ON)
         set(MINIFB_CXX_EXTENSIONS ON)
     else()

From a8a76ececb68ce4660dca14d668465ad2992aec3 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 7 Aug 2026 13:31:38 +1000
Subject: [PATCH 26/31] prevent conflicts with new and old cmake flags

also remove versioning.cmake
---
 CMakeLists.txt                   | 31 +++++++++++----------
 cmake/minifb_cmake_helpers.cmake | 48 ++++++++++++++++++++++++++++++++
 cmake/versioning.cmake           | 46 ------------------------------
 3 files changed, 64 insertions(+), 61 deletions(-)
 delete mode 100644 cmake/versioning.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8815dbd..878656c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,6 @@ if (MACOS OR IOS)
 endif()
 
 include(GNUInstallDirs)
-include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/versioning.cmake")
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/minifb_cmake_helpers.cmake")
 if (POLICY CMP0072)
     cmake_policy(SET CMP0072 NEW)  # Prefer GLVND
@@ -150,6 +149,22 @@ option(MINIFB_AVOID_CPP_HEADERS "Avoid including C++ Headers" FALSE)
 # purely for internal use, never exposed to the user
 set(MINIFB_USE_X11_API OFF)
 
+# unfortunatly these old deprecated options can't fit nicely into dependent options due to our custom function, but when we remove these, we can remove this whole block
+if (MACOS)
+	minifb_apply_deprecated_option(USE_METAL_API MINIFB_USE_METAL_API "Build the project using Metal API code")
+	minifb_apply_deprecated_option(USE_INVERTED_Y_ON_MACOS MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)")
+elseif (LINUX)
+    minifb_apply_deprecated_option(USE_WAYLAND_API MINIFB_USE_WAYLAND_API "Build the project using Wayland API code")
+	if (NOT MINIFB_USE_WAYLAND_API)
+		set(MINIFB_USE_X11_API ON)
+		minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
+	endif()
+elseif (WIN32)
+    minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
+endif()
+
+if (NOT MINIFB_HAVE_SET_LEGACY_OPTION) # only use new options if no legacy options are used to prevent conflicts
+
 if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
 
     # requires 3.22+ to use full condition syntax, technically could use in 3.16, but it would be a lot worse
@@ -202,12 +217,7 @@ else()
         option(MINIFB_USE_WAYLAND_API "Build the project using Wayland API code" OFF)
     else()
         set(MINIFB_USE_WAYLAND_API OFF)
-    endif()
-
-    if (LINUX AND NOT MINIFB_USE_WAYLAND_API)
         set(MINIFB_USE_X11_API ON)
-    else()
-        set(MINIFB_USE_X11_API OFF)
     endif()
 
     if (WIN32 OR MINIFB_USE_X11_API)
@@ -218,15 +228,6 @@ else()
 
 endif()
 
-# unfortunatly these old deprecated options can't fit nicely into dependent options due to our custom function, but when we remove these, we can remove this whole block
-if (MACOS)
-    minifb_apply_deprecated_option(USE_METAL_API MINIFB_USE_METAL_API "Build the project using Metal API code")
-    minifb_apply_deprecated_option(USE_INVERTED_Y_ON_MACOS MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)")
-elseif (LINUX)
-    minifb_apply_deprecated_option(USE_WAYLAND_API MINIFB_USE_WAYLAND_API "Build the project using Wayland API code")
-    minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
-elseif (WIN32)
-    minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
 endif()
 
 # Compilation configuration (library and examples)
diff --git a/cmake/minifb_cmake_helpers.cmake b/cmake/minifb_cmake_helpers.cmake
index fa261a8..fbfc330 100644
--- a/cmake/minifb_cmake_helpers.cmake
+++ b/cmake/minifb_cmake_helpers.cmake
@@ -7,4 +7,52 @@ function(minifb_apply_deprecated_option legacy_var new_var new_help)
         set(${new_var} "${_legacy_value}" CACHE BOOL "${new_help}" FORCE)
     endif()
     set(${legacy_var} "${${new_var}}" PARENT_SCOPE)
+	set(MINIFB_HAVE_USED_LEGACY_OPTION TRUE PARENT_SCOPE)
+endfunction()
+
+function(minifb_compute_git_metadata out_commits_since_tag out_commit_count out_git_sha out_git_dirty)
+    set(_commits_since_tag 0)
+    set(_commit_count 0)
+    set(_git_sha "unknown")
+    set(_git_dirty 0)
+
+    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+        find_package(Git QUIET)
+        if (GIT_FOUND)
+            execute_process(
+                COMMAND "${GIT_EXECUTABLE}" rev-list --count HEAD
+                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                RESULT_VARIABLE _git_count_result
+                OUTPUT_VARIABLE _git_count_output
+                ERROR_QUIET
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+            if (_git_count_result EQUAL 0 AND _git_count_output MATCHES "^[0-9]+$")
+                set(_commit_count "${_git_count_output}")
+            endif()
+
+            execute_process(
+                COMMAND "${GIT_EXECUTABLE}" describe --tags --long --dirty
+                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                RESULT_VARIABLE _git_describe_result
+                OUTPUT_VARIABLE _git_describe_output
+                ERROR_QUIET
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+            if (_git_describe_result EQUAL 0)
+                if (_git_describe_output MATCHES ".*-([0-9]+)-g([0-9a-fA-F]+)(-dirty)?$")
+                    set(_commits_since_tag "${CMAKE_MATCH_1}")
+                    set(_git_sha "${CMAKE_MATCH_2}")
+                    if (CMAKE_MATCH_3 STREQUAL "-dirty")
+                        set(_git_dirty 1)
+                    endif()
+                endif()
+            endif()
+        endif()
+    endif()
+
+    set(${out_commits_since_tag} "${_commits_since_tag}" PARENT_SCOPE)
+    set(${out_commit_count} "${_commit_count}" PARENT_SCOPE)
+    set(${out_git_sha} "${_git_sha}" PARENT_SCOPE)
+    set(${out_git_dirty} "${_git_dirty}" PARENT_SCOPE)
 endfunction()
diff --git a/cmake/versioning.cmake b/cmake/versioning.cmake
deleted file mode 100644
index 2a4d216..0000000
--- a/cmake/versioning.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-function(minifb_compute_git_metadata out_commits_since_tag out_commit_count out_git_sha out_git_dirty)
-    set(_commits_since_tag 0)
-    set(_commit_count 0)
-    set(_git_sha "unknown")
-    set(_git_dirty 0)
-
-    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-        find_package(Git QUIET)
-        if (GIT_FOUND)
-            execute_process(
-                COMMAND "${GIT_EXECUTABLE}" rev-list --count HEAD
-                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-                RESULT_VARIABLE _git_count_result
-                OUTPUT_VARIABLE _git_count_output
-                ERROR_QUIET
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-            if (_git_count_result EQUAL 0 AND _git_count_output MATCHES "^[0-9]+$")
-                set(_commit_count "${_git_count_output}")
-            endif()
-
-            execute_process(
-                COMMAND "${GIT_EXECUTABLE}" describe --tags --long --dirty
-                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-                RESULT_VARIABLE _git_describe_result
-                OUTPUT_VARIABLE _git_describe_output
-                ERROR_QUIET
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-            if (_git_describe_result EQUAL 0)
-                if (_git_describe_output MATCHES ".*-([0-9]+)-g([0-9a-fA-F]+)(-dirty)?$")
-                    set(_commits_since_tag "${CMAKE_MATCH_1}")
-                    set(_git_sha "${CMAKE_MATCH_2}")
-                    if (CMAKE_MATCH_3 STREQUAL "-dirty")
-                        set(_git_dirty 1)
-                    endif()
-                endif()
-            endif()
-        endif()
-    endif()
-
-    set(${out_commits_since_tag} "${_commits_since_tag}" PARENT_SCOPE)
-    set(${out_commit_count} "${_commit_count}" PARENT_SCOPE)
-    set(${out_git_sha} "${_git_sha}" PARENT_SCOPE)
-    set(${out_git_dirty} "${_git_dirty}" PARENT_SCOPE)
-endfunction()

From 6a86a264ad213521c9849bf1409473735134a310 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 7 Aug 2026 14:01:24 +1000
Subject: [PATCH 27/31] remove a useless cmake policy set

the policy is enabled by default on cmake 3.11+, and the only effect of
it is to set OpenGL_GL_PREFERENCE to "GLVND", which we ALSO manually
did. given that this is the default, i removed both.
---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 878656c..f39d3b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,10 +24,6 @@ endif()
 
 include(GNUInstallDirs)
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/minifb_cmake_helpers.cmake")
-if (POLICY CMP0072)
-    cmake_policy(SET CMP0072 NEW)  # Prefer GLVND
-endif()
-set(OpenGL_GL_PREFERENCE "GLVND")
 
 # use IDE folders in build systems that support it. enabled by default in cmake 3.26+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

From d06eb6697c5fdcc4b8e4c8d157ff895f10bb4666 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 7 Aug 2026 14:19:58 +1000
Subject: [PATCH 28/31] add a case for failing to find obj-c in cmake

also fix some tabs->spaces
---
 CMakeLists.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f39d3b5..157c172 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,10 +14,13 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(MACOS TRUE)
 endif()
 
+# ensure that an objective-c compiler exists when attempting to compile on any target that uses objective-c
 if (MACOS OR IOS)
     include(CheckLanguage)
     check_language(OBJC)
-    if (CMAKE_OBJC_COMPILER)
+    if (CMAKE_OBJC_COMPILER STREQUAL "NOTFOUND")
+        message(FATAL "No OBJC compiler could be found.")
+    else()
         enable_language(OBJC)
     endif()
 endif()
@@ -147,14 +150,14 @@ set(MINIFB_USE_X11_API OFF)
 
 # unfortunatly these old deprecated options can't fit nicely into dependent options due to our custom function, but when we remove these, we can remove this whole block
 if (MACOS)
-	minifb_apply_deprecated_option(USE_METAL_API MINIFB_USE_METAL_API "Build the project using Metal API code")
-	minifb_apply_deprecated_option(USE_INVERTED_Y_ON_MACOS MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)")
+    minifb_apply_deprecated_option(USE_METAL_API MINIFB_USE_METAL_API "Build the project using Metal API code")
+    minifb_apply_deprecated_option(USE_INVERTED_Y_ON_MACOS MINIFB_USE_INVERTED_Y_ON_MACOS "Use default mouse position: (0, 0) at (left, down)")
 elseif (LINUX)
     minifb_apply_deprecated_option(USE_WAYLAND_API MINIFB_USE_WAYLAND_API "Build the project using Wayland API code")
-	if (NOT MINIFB_USE_WAYLAND_API)
-		set(MINIFB_USE_X11_API ON)
-		minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
-	endif()
+    if (NOT MINIFB_USE_WAYLAND_API)
+        set(MINIFB_USE_X11_API ON)
+        minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
+    endif()
 elseif (WIN32)
     minifb_apply_deprecated_option(USE_OPENGL_API MINIFB_USE_OPENGL_API "Build the project using OpenGL API code")
 endif()

From 0b58437f395466377461fbd6a84e9144e4301255 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 7 Aug 2026 14:26:24 +1000
Subject: [PATCH 29/31] minor cmake changes

---
 CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 157c172..41b1abe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ if (MACOS OR IOS)
 endif()
 
 include(GNUInstallDirs)
-include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/minifb_cmake_helpers.cmake")
+include("cmake/minifb_cmake_helpers.cmake")
 
 # use IDE folders in build systems that support it. enabled by default in cmake 3.26+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -43,7 +43,7 @@ minifb_compute_git_metadata(
     MINIFB_GIT_DIRTY
 )
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/include/minifb_version.h.in"
+    include/minifb_version.h.in
     "${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h"
     @ONLY
 )
@@ -59,7 +59,7 @@ set(SrcLib
     include/MiniFB_types.h
 
     # remember to include generated headers as source files
-    ${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h
+    "${MINIFB_GENERATED_INCLUDE_DIR}/minifb_version.h"
 
     src/MiniFB_common.c
     src/MiniFB_cpp.cpp
@@ -455,7 +455,7 @@ function(minifb_add_example)
 
         add_custom_command(TARGET ${arg_NAME} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy
-                "${CMAKE_CURRENT_SOURCE_DIR}/examples/web/${arg_NAME}.html"
+                "examples/web/${arg_NAME}.html"
                 "${CMAKE_CURRENT_BINARY_DIR}"
             )
 
@@ -465,12 +465,12 @@ function(minifb_add_example)
 
         if (${arg_IOS_STORYBOARD})
             set_target_properties(${arg_NAME} PROPERTIES
-                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.plist"
+                MACOSX_BUNDLE_INFO_PLIST "examples/ios/Info.plist"
                 RESOURCE "examples/ios/LaunchScreen.storyboard"
             )
         elseif (${arg_IOS_NO_STORYBOARD})
             set_target_properties(${arg_NAME} PROPERTIES
-                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/ios/Info.no_storyboard.plist"
+                MACOSX_BUNDLE_INFO_PLIST "examples/ios/Info.no_storyboard.plist"
             )
         endif()
     endif()
@@ -539,7 +539,7 @@ install(EXPORT minifb
 # generate file from our template that will be found directly by find_package (<name>-config.cmake is one of file filenames it searches for)
 # the file will find dependancies and `include`s the previously created minifb-targets.cmake
 configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/minifb-config.cmake.in"
+    "cmake/minifb-config.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/minifb-config.cmake"
     INSTALL_DESTINATION "${MINIFB_CMAKE_CONFIG_INSTALL_DIR}"
 )

From 2a3795d5055e4f29293a94dd681496e06a61feb4 Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Fri, 7 Aug 2026 20:12:36 +1000
Subject: [PATCH 30/31] cmake comments

---
 CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41b1abe..c9d4d63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,7 @@ endif()
 
 endif()
 
-# Compilation configuration (library and examples)
+# Compilation configuration (will be ran on library and examples)
 #--------------------------------------
 function(minifb_configure_target target)
     if (NOT MSVC)
@@ -307,7 +307,7 @@ endfunction()
 # Create library target and configure
 #--------------------------------------
 add_library(minifb STATIC ${SrcLib})
-add_library(minifb::minifb ALIAS minifb)
+add_library(minifb::minifb ALIAS minifb) # cmake installing will install the "minifb::" namespace
 
 set_property(TARGET minifb PROPERTY FOLDER "Libs")
 minifb_configure_target(minifb)
@@ -358,7 +358,7 @@ elseif (DJGPP)
     target_sources(minifb PRIVATE ${SrcDOS})
 endif()
 
-# Linking main library
+# Link main library
 #--------------------------------------
 if (MINIFB_USE_OPENGL_API)
     find_package(OpenGL)
@@ -453,6 +453,7 @@ function(minifb_add_example)
             "-sSINGLE_FILE"
         )
 
+        # copy the example's .html file into the build directory after the example is built
         add_custom_command(TARGET ${arg_NAME} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy
                 "examples/web/${arg_NAME}.html"

From 719af007d08aabaf337ee0cdc7d74ed9aa2f50eb Mon Sep 17 00:00:00 2001
From: cannedbeef <cannedbeef255@proton.me>
Date: Tue, 11 Aug 2026 23:41:29 +1000
Subject: [PATCH 31/31] fix creating generated headers directory

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9d4d63..2ca7d35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # directory to add generated headers (created during configuration)
 set(MINIFB_GENERATED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
-file(MAKE_DIRECTORY "${output_dir}")
+file(MAKE_DIRECTORY "${MINIFB_GENERATED_INCLUDE_DIR}")
 
 # generate the version header from the templace (.in)
 minifb_compute_git_metadata(