chore(build): fix compatibility with CMake 4.x

This commit is contained in:
fallenoak 2025-09-02 17:28:17 -05:00
parent 967534c96b
commit 4a8bf35caa
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
10 changed files with 29 additions and 24 deletions

View File

@ -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

2
lib/bc

@ -1 +1 @@
Subproject commit 6cff259dcac37698fd0c770d806646be13402b43
Subproject commit 2e33131584a01814b648012b207ad189aa47c8db

@ -1 +1 @@
Subproject commit 0a260b7bebe28bbc5998068f6f14e459a869de16
Subproject commit ced41bd5a5eb859a3785e867163fb12bb0d73710

@ -1 +1 @@
Subproject commit f10552acea5fbfaa7f03075eddd46a92132bf732
Subproject commit 222e3ec6240bd511ebdafc4c0617bae684201902

@ -1 +1 @@
Subproject commit f886ab5bc35b2e0d968baa8dec3faaccf385fbc3
Subproject commit 63f4f710e47d37e82930d4a1750c7d3b36b700ec

@ -1 +1 @@
Subproject commit 036c986cd455179873baeb75e81fd3edaca4abbe
Subproject commit d9a644e5f3488da2b66dc9a8b17dd4c435bc27db

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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;