Squashed 'deps/nostalgia/' changes from 31b39982..671fa54f

671fa54f [ox/std] Make ox::Vector::push_back comply with std::vector::push_back
51743267 [nostalgia/gfx/studio] Cleanup includes
b31c01f7 [keel,studio] Cleanup
f41213f1 [ox/std] Fix channel format for oxLogError
28be7c46 [ox/fs] Fix write functions to take SpanViews
2f340b13 [ox/std] Fix Windows GCC build
312c8188 [nostalgia/gfx/studio] Remove unused variable
0d69d0c4 [ox/std] Remove oxDebug line
81a0b8c8 [ox/mc] Remove an oxDebug line
172b5aee [ox/oc] Remove an oxDebug line
2b5338a9 [nostalgia] Improve Makefile dependency handling
8a430faf [keel] Cleanup
e59382dd [keel] Address undefined behavior
3006e77e [ox/std] Add and integrate std::launder
59c112a6 [studio] Fix navigate back not to iterate on the first item twice

git-subtree-dir: deps/nostalgia
git-subtree-split: 671fa54f6f3f16f4772353bb0b12cfe09dd2fd92
This commit is contained in:
2025-09-10 23:48:49 -05:00
parent 6b0a56d5d6
commit 5384d8c83b
32 changed files with 181 additions and 142 deletions

View File

@@ -14,7 +14,7 @@ endif
PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
.PHONY: pkg-gba
pkg-gba: build
pkg-gba: build-pack build-gba-player
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
.PHONY: pkg-mac
@@ -26,25 +26,44 @@ generate-studio-rsrc:
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json
${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/nostalgia/studio/rsrc.json
.PHONY: build-gba-player
build-gba-player:
cmake --build ./build/gba-*
.PHONY: build-player
build-player:
${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
.PHONY: build-pack
build-pack:
cmake --build ./build/${BC_VAR_CURRENT_BUILD} --target ${BC_VAR_PROJECT_NAME}-pack
.PHONY: run
run: build-player
${PROJECT_PLAYER} sample_project
.PHONY: build-studio
build-studio:
cmake --build ./build/${BC_VAR_CURRENT_BUILD} --target ${BC_VAR_PROJECT_NAME_CAP}Studio
.PHONY: run-studio
run-studio: build
run-studio: build-studio
${PROJECT_STUDIO}
.PHONY: gba-run
gba-run: pkg-gba
${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
.PHONY: debug
debug: build
${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
.PHONY: debug-studio
debug-studio: build
${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
.PHONY: configure-gba
configure-gba:
${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=release --build_root=${BC_VAR_BUILD_PATH}