From 4a8bf35caab361a3c29daa97d62c5c5423116b67 Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Tue, 2 Sep 2025 17:28:17 -0500
Subject: [PATCH] chore(build): fix compatibility with CMake 4.x

---
 CMakeLists.txt              |  2 +-
 lib/bc                      |  2 +-
 lib/common                  |  2 +-
 lib/squall                  |  2 +-
 lib/system                  |  2 +-
 lib/typhoon                 |  2 +-
 src/event/Event.cpp         | 11 +++++------
 src/event/Input.cpp         | 20 ++++++++++++--------
 src/event/win/Input.cpp     |  5 +++--
 src/gx/texture/CBLPFile.cpp |  5 +++--
 10 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db33305..d2355b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1...3.5)
 
 if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
     message(FATAL_ERROR
diff --git a/lib/bc b/lib/bc
index 6cff259..2e33131 160000
--- a/lib/bc
+++ b/lib/bc
@@ -1 +1 @@
-Subproject commit 6cff259dcac37698fd0c770d806646be13402b43
+Subproject commit 2e33131584a01814b648012b207ad189aa47c8db
diff --git a/lib/common b/lib/common
index 0a260b7..ced41bd 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit 0a260b7bebe28bbc5998068f6f14e459a869de16
+Subproject commit ced41bd5a5eb859a3785e867163fb12bb0d73710
diff --git a/lib/squall b/lib/squall
index f10552a..222e3ec 160000
--- a/lib/squall
+++ b/lib/squall
@@ -1 +1 @@
-Subproject commit f10552acea5fbfaa7f03075eddd46a92132bf732
+Subproject commit 222e3ec6240bd511ebdafc4c0617bae684201902
diff --git a/lib/system b/lib/system
index f886ab5..63f4f71 160000
--- a/lib/system
+++ b/lib/system
@@ -1 +1 @@
-Subproject commit f886ab5bc35b2e0d968baa8dec3faaccf385fbc3
+Subproject commit 63f4f710e47d37e82930d4a1750c7d3b36b700ec
diff --git a/lib/typhoon b/lib/typhoon
index 036c986..d9a644e 160000
--- a/lib/typhoon
+++ b/lib/typhoon
@@ -1 +1 @@
-Subproject commit 036c986cd455179873baeb75e81fd3edaca4abbe
+Subproject commit d9a644e5f3488da2b66dc9a8b17dd4c435bc27db
diff --git a/src/event/Event.cpp b/src/event/Event.cpp
index 6d25f25..3d044e5 100644
--- a/src/event/Event.cpp
+++ b/src/event/Event.cpp
@@ -115,12 +115,11 @@ void EventRegister(EVENTID id, EVENTHANDLERFUNC handler) {
 }
 
 void EventRegisterEx(EVENTID id, EVENTHANDLERFUNC handler, void* param, float priority) {
-    STORM_ASSERT(id >= 0);
-    STORM_VALIDATE(id >= 0, ERROR_INVALID_PARAMETER);
-    STORM_ASSERT(id < EVENTIDS);
-    STORM_VALIDATE(id < EVENTIDS, ERROR_INVALID_PARAMETER);
-    STORM_ASSERT(handler);
-    STORM_VALIDATE(handler, ERROR_INVALID_PARAMETER);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(id >= 0);
+    STORM_VALIDATE(id < EVENTIDS);
+    STORM_VALIDATE(handler);
+    STORM_VALIDATE_END_VOID;
 
     HEVENTCONTEXT hContext = PropGet(PROP_EVENTCONTEXT);
 
diff --git a/src/event/Input.cpp b/src/event/Input.cpp
index 8a25fca..0ed01b9 100644
--- a/src/event/Input.cpp
+++ b/src/event/Input.cpp
@@ -192,8 +192,9 @@ void PostSize(EvtContext* context, int32_t w, int32_t h) {
 }
 
 void ProcessInput(const int32_t param[], OSINPUT id, int32_t* shutdown, EvtContext* context) {
-    STORM_ASSERT(context);
-    STORM_VALIDATE(context, ERROR_INVALID_PARAMETER);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(context);
+    STORM_VALIDATE_END_VOID;
 
     switch (id) {
         case OS_INPUT_CAPTURE_CHANGED:
@@ -361,8 +362,9 @@ void ConvertPosition(int32_t clientx, int32_t clienty, float* x, float* y) {
 }
 
 void EventSetMouseMode(MOUSEMODE mode, uint32_t holdButton) {
-    STORM_ASSERT(mode < MOUSE_MODES);
-    STORM_VALIDATE(mode < MOUSE_MODES, ERROR_INVALID_PARAMETER);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(mode < MOUSE_MODES);
+    STORM_VALIDATE_END_VOID;
 
     auto contextId = *reinterpret_cast<uint32_t*>(PropGet(PROP_EVENTCONTEXT));
     int32_t findMask;
@@ -468,8 +470,9 @@ void IEvtInputInitialize() {
 }
 
 int32_t IEvtInputProcess(EvtContext* context, int32_t* shutdown) {
-    STORM_ASSERT(context);
-    STORM_VALIDATE(context, ERROR_INVALID_PARAMETER, 0);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(context);
+    STORM_VALIDATE_END;
 
     int32_t v4 = 0;
     OSINPUT id;
@@ -484,8 +487,9 @@ int32_t IEvtInputProcess(EvtContext* context, int32_t* shutdown) {
 }
 
 void IEvtInputSetMouseMode(EvtContext* context, MOUSEMODE mode, uint32_t holdButton) {
-    STORM_ASSERT(context);
-    STORM_VALIDATE(context, ERROR_INVALID_PARAMETER);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(context);
+    STORM_VALIDATE_END_VOID;
 
     if ((Input::s_buttonState & holdButton) == holdButton) {
         Input::s_mouseHoldButton = holdButton;
diff --git a/src/event/win/Input.cpp b/src/event/win/Input.cpp
index a3a2f12..98030ec 100644
--- a/src/event/win/Input.cpp
+++ b/src/event/win/Input.cpp
@@ -408,8 +408,9 @@ int32_t OsInputGet(OSINPUT* id, int32_t* param0, int32_t* param1, int32_t* param
 }
 
 void OsInputSetMouseMode(OS_MOUSE_MODE mode) {
-    STORM_ASSERT(mode < OS_MOUSE_MODES);
-    STORM_VALIDATE(mode < OS_MOUSE_MODES, ERROR_INVALID_PARAMETER);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(mode < OS_MOUSE_MODES);
+    STORM_VALIDATE_END_VOID;
 
     if (Input::s_osMouseMode == mode) {
         return;
diff --git a/src/gx/texture/CBLPFile.cpp b/src/gx/texture/CBLPFile.cpp
index c237b71..106a203 100644
--- a/src/gx/texture/CBLPFile.cpp
+++ b/src/gx/texture/CBLPFile.cpp
@@ -132,8 +132,9 @@ int32_t CBLPFile::LockChain2(const char* fileName, PIXEL_FORMAT format, MipBits*
 }
 
 int32_t CBLPFile::Open(const char* filename, int32_t a3) {
-    STORM_ASSERT(filename);
-    STORM_VALIDATE(filename, ERROR_INVALID_PARAMETER, 0);
+    STORM_VALIDATE_BEGIN;
+    STORM_VALIDATE(filename);
+    STORM_VALIDATE_END;
 
     this->m_inMemoryImage = nullptr;