[studio] Add missing include

[ox] Add writeOC Writer_c variant
[studio] Fix change-format to only write data portion once
2026-05-17 15:36:57 -05:00 · 2026-05-17 15:31:56 -05:00 · 2026-05-17 15:22:11 -05:00 · 2026-05-17 15:19:13 -05:00 · 2026-05-17 15:07:10 -05:00 · 2026-05-17 15:02:07 -05:00
469 changed files with 390 additions and 211 deletions
@@ -9,7 +9,7 @@ else()
 	project(nostalgia C CXX)
 endif()

-include(deps/buildcore/base.cmake)
+include(deps/oxlib/deps/buildcore/base.cmake)

 set(OX_ENABLE_TRACEHOOK OFF CACHE BOOL "Generate OxTraceHook shared library for uprobes")

@@ -35,10 +35,7 @@ else()
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 endif()

-add_subdirectory(deps/ox)
-include_directories(
-	deps/ox/src
-)
+add_subdirectory(deps/oxlib)
 add_subdirectory(deps/teagba)

 if(NOT BUILDCORE_TARGET STREQUAL "gba")
@@ -1,7 +1,7 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
 BC_VAR_DEVENV_ROOT=util
-BUILDCORE_PATH=deps/ox/deps/buildcore
+BUILDCORE_PATH=deps/oxlib/deps/buildcore
 include ${BUILDCORE_PATH}/base.mk

 ifeq ($(BC_VAR_OS),darwin)
@@ -20,11 +20,11 @@ git-setup-ox-remote:
 .PHONY: git-pull-ox
 git-pull-ox:
 	git fetch ox-master master
-	git subtree pull --prefix deps/ox ox-master master --squash
+	git subtree pull --prefix deps/oxlib ox-master master --squash

 .PHONY: git-push-ox
 git-push-ox:
-	git subtree push --prefix=deps/ox ox-master master
+	git subtree push --prefix=deps/oxlib ox-master master

 .PHONY: pkg-gba
 pkg-gba: build-pack build-gba-player
@@ -3,6 +3,7 @@ build/gba
 build/*-asan
 build/*-debug
 build/*-release
+dist
 .current_build
 tags
 compile_commands.json
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.25)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19

 project(Ox CXX)
@@ -78,13 +78,6 @@ include_directories(src)

 install(FILES OxConfig.cmake DESTINATION lib/cmake/ox)

-install(
-    DIRECTORY
-        include/ox
-    DESTINATION
-        include
-)
-
 if(OX_USE_STDLIB)
 	set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include")
 	add_subdirectory(deps/jsoncpp)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
gary	d10a71f06d	[studio] Add missing include Build / build (push) Failing after 1m6s Details	2026-05-17 15:36:57 -05:00
gary	9593e7eef9	[ox] Add writeOC Writer_c variant	2026-05-17 15:31:56 -05:00
gary	2f9b9c0842	[studio] Fix change-format to only write data portion once Build / build (push) Successful in 1m15s Details	2026-05-17 15:22:11 -05:00
gary	dce09b564c	[ox/std] Fix Result::originate to return value Build / build (push) Successful in 1m12s Details	2026-05-17 15:19:13 -05:00
gary	9f485d9496	[studio] Cleanup Build / build (push) Successful in 1m9s Details	2026-05-17 15:07:10 -05:00
gary	2c50ce48ed	[ox/std] Add Result::reoriginate functions	2026-05-17 15:02:07 -05:00
gary	72e16cb285	[studio] Change output of Claw OC files to make them recognizable as test files	2026-05-17 14:53:42 -05:00
gary	d1e410ac55	[ox/std] Add caseInsensitiveEquals	2026-05-17 14:30:43 -05:00
gary	be32d575f5	[ox/claw] Add writeClaw Writer_c variant	2026-05-17 14:29:43 -05:00
gary	f24929f421	[studio] Remove extra copyright header Build / build (push) Successful in 1m16s Details	2026-05-16 16:44:13 -05:00
gary	2d426d2bb3	[studio] Fix change-format format reading Build / build (push) Successful in 1m13s Details	2026-05-16 16:29:19 -05:00
gary	f89af6fcb3	[studio] Fix change-format usage message Build / build (push) Successful in 1m12s Details	2026-05-16 16:17:00 -05:00
gary	899eaa9dce	[studio] Add change-format subcommand Build / build (push) Successful in 1m13s Details	2026-05-16 16:12:29 -05:00
gary	d32b1033c3	[nostalgia/gfx/studio] Cleanup	2026-05-16 14:11:20 -05:00
gary	1d2814bbd0	Merge commit '2e119b5683574d7243d30a9ba33c05b06bcdb8a4' Build / build (push) Successful in 1m15s Details	2026-05-08 22:36:42 -05:00
gary	2e119b5683	Squashed 'deps/oxlib/' changes from 170d6e35a..a787fef61 a787fef61 Uncomment code that from Pico fix 298184d58 Fix build warning 51999199c [ox] Fix build problems on Raspberry Pi Pico 682fc5b85 Merge commit 'c286e3794d9d4cc571671548ad765ce370bcfcb4' 94209fd74 [ox/std] Make is_integral use raw types git-subtree-dir: deps/oxlib git-subtree-split: a787fef6147dcd11519c24f992289349f0ec355d	2026-05-08 22:36:42 -05:00
gary	46c6ba2e17	Merge commit 'c286e3794d9d4cc571671548ad765ce370bcfcb4'	2026-05-07 01:18:59 -05:00
gary	c286e3794d	Squashed 'deps/oxlib/' changes from 85f17c418..170d6e35a 170d6e35a [ox] Add dist to gitignore 83fd814d6 [ox] Bump required CMake version git-subtree-dir: deps/oxlib git-subtree-split: 170d6e35a67739b600aa95abfff7269972a45c00	2026-05-07 01:18:59 -05:00
gary	45cbede7e2	[ox/std] Make is_integral use raw types	2026-05-07 01:16:57 -05:00
gary	5aa133a788	[nostalgia] Fix Ox references Build / build (push) Successful in 1m9s Details	2026-05-06 02:48:59 -05:00
gary	fafe78ba80	[nostalgia] Adjust for new ox path Build / build (push) Successful in 1m9s Details	2026-05-06 01:40:34 -05:00
gary	69fcd7ad10	Squashed 'deps/oxlib/' content from commit 85f17c41 git-subtree-dir: deps/oxlib git-subtree-split: 85f17c4188e266b82ba8858d21f67289c72e7b9a	2026-05-06 01:38:00 -05:00
gary	335a61bd79	Merge commit '69fcd7ad1056940166a5d9524b4f03578f680834' as 'deps/oxlib'	2026-05-06 01:38:00 -05:00