[nostalgia/studio] Update version to d2024.12.0

2024-12-21 19:27:00 -06:00
369 changed files with 562 additions and 785 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,7 +6,7 @@
 .mypy_cache
 .stfolder
 .stignore
-util/scripts/__pycache__
+scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
--- a/.liccor.yml
+++ b/.liccor.yml
@ -2,4 +2,4 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
--- a/util/Dockerfile
+++ b/util/Dockerfile
@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:36

 RUN dnf update -y

--- a/3
+++ b/3
@ -1,6 +1,5 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
-BC_VAR_DEVENV_ROOT=util
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk

@ -14,7 +13,7 @@ endif

 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}

 .PHONY: run
 run: build
--- a/deps/gbabuildcore/base.cmake
+++ b/deps/gbabuildcore/base.cmake
@ -1,8 +1,8 @@
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb-interwork")
--- a/deps/glad/CMakeLists.txt
+++ b/deps/glad/CMakeLists.txt
@ -1,11 +1,2 @@
-add_library(glad src/glad.c)
-
-target_include_directories(glad PUBLIC include)
-
-install(
-	TARGETS
-		glad
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+add_library(glad OBJECT src/glad.c)
+target_include_directories(glad PUBLIC include)
--- a/deps/imgui/CMakeLists.txt
+++ b/deps/imgui/CMakeLists.txt
@ -6,7 +6,7 @@ endif()
 # DrinkingTea: end

 add_library(
-	imgui
+	imgui OBJECT
 		imgui.cpp
 		imgui_demo.cpp
 		imgui_draw.cpp
@ -19,12 +19,4 @@ add_library(
 target_include_directories(
 	imgui SYSTEM PUBLIC
 		.
-)
-
-install(
-	TARGETS
-		imgui
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+)
--- a/deps/ox/.liccor.yml
+++ b/deps/ox/.liccor.yml
@ -2,7 +2,7 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2015 - 2025 gary@drinkingtea.net
+  Copyright 2015 - 2024 gary@drinkingtea.net

  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/clargs/clargs.cpp
+++ b/deps/ox/src/ox/clargs/clargs.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/clargs/clargs.hpp
+++ b/deps/ox/src/ox/clargs/clargs.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/claw.hpp
+++ b/deps/ox/src/ox/claw/claw.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/format.hpp
+++ b/deps/ox/src/ox/claw/format.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/read.cpp
+++ b/deps/ox/src/ox/claw/read.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/read.hpp
+++ b/deps/ox/src/ox/claw/read.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/readclaw.cpp
+++ b/deps/ox/src/ox/claw/readclaw.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/test/tests.cpp
+++ b/deps/ox/src/ox/claw/test/tests.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/write.cpp
+++ b/deps/ox/src/ox/claw/write.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/claw/write.hpp
+++ b/deps/ox/src/ox/claw/write.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/event/event.hpp
+++ b/deps/ox/src/ox/event/event.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/event/signal.cpp
+++ b/deps/ox/src/ox/event/signal.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/event/signal.hpp
+++ b/deps/ox/src/ox/event/signal.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -215,7 +215,7 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		}
 		return ox::Error(0);
 	} catch (const ox::Exception &ex) {
-		return ox::Error(ex.errCode, ex.msg, ex.src);
+		return ox::Error(ex.file, ex.line, ex.errCode, ex.msg);
 	}
 }

--- a/deps/ox/src/ox/event/test/tests.cpp
+++ b/deps/ox/src/ox/event/test/tests.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp
+++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
+++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/directory.cpp
+++ b/deps/ox/src/ox/fs/filesystem/directory.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/directory.hpp
+++ b/deps/ox/src/ox/fs/filesystem/directory.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filelocation.cpp
+++ b/deps/ox/src/ox/fs/filesystem/filelocation.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filelocation.hpp
+++ b/deps/ox/src/ox/fs/filesystem/filelocation.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filesystem.cpp
+++ b/deps/ox/src/ox/fs/filesystem/filesystem.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/filesystem.hpp
+++ b/deps/ox/src/ox/fs/filesystem/filesystem.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp
+++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp
+++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp
+++ b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/pathiterator.hpp
+++ b/deps/ox/src/ox/fs/filesystem/pathiterator.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/filesystem/types.hpp
+++ b/deps/ox/src/ox/fs/filesystem/types.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/fs.hpp
+++ b/deps/ox/src/ox/fs/fs.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp
+++ b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/ptrarith/ptr.hpp
+++ b/deps/ox/src/ox/fs/ptrarith/ptr.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/test/tests.cpp
+++ b/deps/ox/src/ox/fs/test/tests.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/fs/tool.cpp
+++ b/deps/ox/src/ox/fs/tool.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/logconn/circularbuff.hpp
+++ b/deps/ox/src/ox/logconn/circularbuff.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/logconn/def.hpp
+++ b/deps/ox/src/ox/logconn/def.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -14,7 +14,7 @@
    { \
 		const auto loggerErr = (loggerName).initConn(appName); \
 		if (loggerErr) { \
-			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.src.file_name(), loggerErr.src.line()); \
+			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line); \
 		} else { \
 			ox::trace::setLogger(&(loggerName)); \
 		} \
--- a/deps/ox/src/ox/logconn/logconn.cpp
+++ b/deps/ox/src/ox/logconn/logconn.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/logconn/logconn.hpp
+++ b/deps/ox/src/ox/logconn/logconn.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/err.hpp
+++ b/deps/ox/src/ox/mc/err.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/intops.hpp
+++ b/deps/ox/src/ox/mc/intops.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/mc.hpp
+++ b/deps/ox/src/ox/mc/mc.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/presenceindicator.cpp
+++ b/deps/ox/src/ox/mc/presenceindicator.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/presenceindicator.hpp
+++ b/deps/ox/src/ox/mc/presenceindicator.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/read.cpp
+++ b/deps/ox/src/ox/mc/read.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/read.hpp
+++ b/deps/ox/src/ox/mc/read.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/test/tests.cpp
+++ b/deps/ox/src/ox/mc/test/tests.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/types.hpp
+++ b/deps/ox/src/ox/mc/types.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/write.cpp
+++ b/deps/ox/src/ox/mc/write.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/mc/write.hpp
+++ b/deps/ox/src/ox/mc/write.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/def.hpp
+++ b/deps/ox/src/ox/model/def.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/descread.hpp
+++ b/deps/ox/src/ox/model/descread.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/desctypes.cpp
+++ b/deps/ox/src/ox/model/desctypes.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/desctypes.hpp
+++ b/deps/ox/src/ox/model/desctypes.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/descwrite.cpp
+++ b/deps/ox/src/ox/model/descwrite.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/descwrite.hpp
+++ b/deps/ox/src/ox/model/descwrite.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/fieldcounter.hpp
+++ b/deps/ox/src/ox/model/fieldcounter.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/metadata.hpp
+++ b/deps/ox/src/ox/model/metadata.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/model.hpp
+++ b/deps/ox/src/ox/model/model.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelhandleradaptor.hpp
+++ b/deps/ox/src/ox/model/modelhandleradaptor.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelops.hpp
+++ b/deps/ox/src/ox/model/modelops.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelvalue.cpp
+++ b/deps/ox/src/ox/model/modelvalue.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/modelvalue.hpp
+++ b/deps/ox/src/ox/model/modelvalue.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/optype.hpp
+++ b/deps/ox/src/ox/model/optype.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/test/tests.cpp
+++ b/deps/ox/src/ox/model/test/tests.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/typenamecatcher.hpp
+++ b/deps/ox/src/ox/model/typenamecatcher.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/types.hpp
+++ b/deps/ox/src/ox/model/types.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/typestore.hpp
+++ b/deps/ox/src/ox/model/typestore.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/model/walk.hpp
+++ b/deps/ox/src/ox/model/walk.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/oc.hpp
+++ b/deps/ox/src/ox/oc/oc.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/read.cpp
+++ b/deps/ox/src/ox/oc/read.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/read.hpp
+++ b/deps/ox/src/ox/oc/read.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/test/tests.cpp
+++ b/deps/ox/src/ox/oc/test/tests.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/write.cpp
+++ b/deps/ox/src/ox/oc/write.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/oc/write.hpp
+++ b/deps/ox/src/ox/oc/write.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/alignmentcatcher.hpp
+++ b/deps/ox/src/ox/preloader/alignmentcatcher.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/platspecs.hpp
+++ b/deps/ox/src/ox/preloader/platspecs.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/preloader.cpp
+++ b/deps/ox/src/ox/preloader/preloader.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/preloader.hpp
+++ b/deps/ox/src/ox/preloader/preloader.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/sizecatcher.hpp
+++ b/deps/ox/src/ox/preloader/sizecatcher.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/preloader/unionsizecatcher.hpp
+++ b/deps/ox/src/ox/preloader/unionsizecatcher.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/CMakeLists.txt
+++ b/deps/ox/src/ox/std/CMakeLists.txt
@ -109,7 +109,6 @@ install(
 		error.hpp
 		fmt.hpp
 		hardware.hpp
-		hash.hpp
 		hashmap.hpp
 		heapmgr.hpp
 		ignore.hpp
--- a/deps/ox/src/ox/std/algorithm.hpp
+++ b/deps/ox/src/ox/std/algorithm.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -9,25 +9,13 @@
 #pragma once

 #include "def.hpp"
-#include "error.hpp"

 OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)

 namespace ox {

 template<typename It, typename T>
-constexpr ox::Result<size_t> findIdx(It begin, It end, T const&value) {
-	auto it = begin;
-	for (; it != end; ++it) {
-		if (*it == value) {
-			return it.offset();
-		}
-	}
-	return ox::Error{1, "item not found"};
-}
-
-template<typename It, typename T>
-constexpr It find(It begin, It end, T const&value) {
+constexpr It find(It begin, It end, const T &value) {
 	for (; begin != end; ++begin) {
 		if (*begin == value) {
 			return begin;
--- a/deps/ox/src/ox/std/anyptr.hpp
+++ b/deps/ox/src/ox/std/anyptr.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/array.hpp
+++ b/deps/ox/src/ox/std/array.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/assert.cpp
+++ b/deps/ox/src/ox/std/assert.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -7,7 +7,6 @@
 */

 #include "fmt.hpp"
-#include "realstd.hpp"
 #include "stacktrace.hpp"
 #include "trace.hpp"

@ -15,14 +14,14 @@

 namespace ox {

-void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const&err) noexcept {
+void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err) noexcept {
 	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
 	if (err.msg) {
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}
 	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+	if (err.file != nullptr) {
+		oxErrf("\tError Location:\t{}:{}\n", err.file, err.line);
 	}
 #ifdef OX_USE_STDLIB
 	printStackTrace(2);
@ -33,19 +32,16 @@ void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const
 #endif
 }

-void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
+void panic(const char *file, int line, const char *panicMsg, const Error &err) noexcept {
 	panic(StringView{file}, line, StringView{panicMsg}, err);
 }

-void assertFailFuncRuntime(
-	StringViewCR file,
-	int const line,
-	StringViewCR assertTxt,
-	StringViewCR msg) noexcept {
+void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept {
 #ifdef OX_USE_STDLIB
-	auto const st = genStackTrace(2);
-	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]:\n{}", msg, assertTxt, file, line, st);
-	abort();
+	auto output = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
+	output += genStackTrace(2);
+	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
+	std::abort();
 #else
 	oxErrf("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
 	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
@ -53,25 +49,20 @@ void assertFailFuncRuntime(
 #endif
 }

-void assertFailFuncRuntime(
-	StringViewCR file,
-	int const line,
-	[[maybe_unused]] Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept {
+void assertFailFuncRuntime(StringViewCR file, int line, [[maybe_unused]] const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
 #if defined(OX_USE_STDLIB)
 	auto msg = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, assertMsg);
 	if (err.msg) {
 		msg += sfmt("\tError Message:\t{}\n", err.msg);
 	}
 	msg += sfmt("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
-		msg += sfmt("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+	if (err.file != nullptr) {
+		msg += sfmt("\tError Location:\t{}:{}\n", err.file, err.line);
 	}
 	msg += genStackTrace(2);
 	oxErr(msg);
 	oxTracef("assert", "Failed assert: {} [{}:{}]", assertMsg, file, line);
-	abort();
+	std::abort();
 #else
 	constexprPanic(file, line, assertMsg);
 #endif
--- a/deps/ox/src/ox/std/assert.hpp
+++ b/deps/ox/src/ox/std/assert.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -22,15 +22,9 @@

 namespace ox {

-[[noreturn]]
-void panic(StringViewCR file, int line, StringViewCR panicMsg, Error const&err = {}) noexcept;
+void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept;

-[[noreturn]]
-constexpr void constexprPanic(
-	StringViewCR file,
-	int const line,
-	StringViewCR panicMsg,
-	Error const&err = {}) noexcept {
+constexpr void constexprPanic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept {
 	if (!std::is_constant_evaluated()) {
 		panic(file, line, panicMsg, err);
 	} else {
@ -38,24 +32,10 @@ constexpr void constexprPanic(
 	}
 }

-void assertFailFuncRuntime(
-	StringViewCR file,
-	int line,
-	StringViewCR assertTxt,
-	StringViewCR msg) noexcept;
-void assertFailFuncRuntime(
-	StringViewCR file,
-	int line,
-	Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept;
+void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept;
+void assertFailFuncRuntime(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept;

-constexpr void assertFunc(
-	StringViewCR file,
-	int const line,
-	bool const pass,
-	[[maybe_unused]]StringViewCR assertTxt,
-	[[maybe_unused]]StringViewCR msg) noexcept {
+constexpr void assertFunc(StringViewCR file, int line, bool pass, [[maybe_unused]]StringViewCR assertTxt, [[maybe_unused]]StringViewCR msg) noexcept {
 	if (!pass) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, assertTxt, msg);
@ -65,12 +45,7 @@ constexpr void assertFunc(
 	}
 }

-constexpr void assertFunc(
-	StringViewCR file,
-	int const line,
-	Error const&err,
-	StringViewCR,
-	StringViewCR assertMsg) noexcept {
+constexpr void assertFunc(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
 	if (err) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, err, {}, assertMsg);
@ -80,11 +55,7 @@ constexpr void assertFunc(
 	}
 }

-constexpr void expect(
-	StringViewCR file,
-	int const line,
-	auto const&actual,
-	auto const&expected) noexcept {
+constexpr void expect(StringViewCR file, int line, const auto &actual, const auto &expected) noexcept {
 	if (actual != expected) {
 		 if (!std::is_constant_evaluated()) {
 #if defined(OX_USE_STDLIB)
--- a/deps/ox/src/ox/std/basestringview.hpp
+++ b/deps/ox/src/ox/std/basestringview.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/bit.cpp
+++ b/deps/ox/src/ox/std/bit.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/bit.hpp
+++ b/deps/ox/src/ox/std/bit.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/bounds.hpp
+++ b/deps/ox/src/ox/std/bounds.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buffer.cpp
+++ b/deps/ox/src/ox/std/buffer.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buffer.hpp
+++ b/deps/ox/src/ox/std/buffer.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buildinfo.cpp
+++ b/deps/ox/src/ox/std/buildinfo.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/deps/ox/src/ox/std/buildinfo.hpp
+++ b/deps/ox/src/ox/std/buildinfo.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/Show More
+++ b/Show More