drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia] Adjust for new ox path
Build / build (push) Successful in 1m9s
Details

Browse Source
This commit is contained in:
Gary Talent
2026-05-06 01:40:34 -05:00
parent 335a61bd79
commit fafe78ba80
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -5
View File
@@ -9,7 +9,7 @@ else()
project(nostalgia C CXX) project(nostalgia C CXX)
endif() 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") 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) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif() endif()
add_subdirectory(deps/ox) add_subdirectory(deps/oxlib)
include_directories(
deps/ox/src
)
add_subdirectory(deps/teagba) add_subdirectory(deps/teagba)
if(NOT BUILDCORE_TARGET STREQUAL "gba") if(NOT BUILDCORE_TARGET STREQUAL "gba")
Makefile
+3 -3
View File
@@ -1,7 +1,7 @@
BC_VAR_PROJECT_NAME=nostalgia BC_VAR_PROJECT_NAME=nostalgia
BC_VAR_PROJECT_NAME_CAP=Nostalgia BC_VAR_PROJECT_NAME_CAP=Nostalgia
BC_VAR_DEVENV_ROOT=util BC_VAR_DEVENV_ROOT=util
BUILDCORE_PATH=deps/ox/deps/buildcore BUILDCORE_PATH=deps/oxlib/deps/buildcore
include ${BUILDCORE_PATH}/base.mk include ${BUILDCORE_PATH}/base.mk
ifeq ($(BC_VAR_OS),darwin) ifeq ($(BC_VAR_OS),darwin)
@@ -20,11 +20,11 @@ git-setup-ox-remote:
.PHONY: git-pull-ox .PHONY: git-pull-ox
git-pull-ox: git-pull-ox:
git fetch ox-master master 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 .PHONY: git-push-ox
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 .PHONY: pkg-gba
pkg-gba: build-pack build-gba-player pkg-gba: build-pack build-gba-player