falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixups: build gc-eu-mq with extracted/dbg, remove asmproc pragmas (#1911) 

* Remove asmproc recurse (somehow these two survived)

* Use `extracted/gc-eu-mq-dbg` anyway for gc-eu-mq
This commit is contained in:
Dragorn421 2024-03-02 18:47:10 +01:00 committed by GitHub
parent 6b9a2433ab
commit ff81e2a891
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -67,6 +67,10 @@ BUILD_DIR := build/$(VERSION)
EXPECTED_DIR := expected/$(BUILD_DIR) EXPECTED_DIR := expected/$(BUILD_DIR)
BASEROM_DIR := baseroms/$(VERSION) BASEROM_DIR := baseroms/$(VERSION)
EXTRACTED_DIR := extracted/$(VERSION) EXTRACTED_DIR := extracted/$(VERSION)
ifeq ($(VERSION),gc-eu-mq)
# TODO: for now, we only extract assets from the Debug ROM (see setup rule)
EXTRACTED_DIR := extracted/gc-eu-mq-dbg
endif
VENV := .venv VENV := .venv
MAKE = make MAKE = make

1
src/overlays/actors/ovl_Demo_Du/z_demo_du.c
View File

@ -16,7 +16,6 @@ void DemoDu_Draw(Actor* thisx, PlayState* play);
static s32 sUnused = 0; static s32 sUnused = 0;
#pragma asmproc recurse
#include "z_demo_du_cutscene_data.inc.c" #include "z_demo_du_cutscene_data.inc.c"
static void* sEyeTextures[] = { gDaruniaEyeOpenTex, gDaruniaEyeOpeningTex, gDaruniaEyeShutTex, gDaruniaEyeClosingTex }; static void* sEyeTextures[] = { gDaruniaEyeOpenTex, gDaruniaEyeOpeningTex, gDaruniaEyeShutTex, gDaruniaEyeClosingTex };

1
src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View File

@ -72,7 +72,6 @@ static ColliderCylinderInitType1 sCylinderInit = {
{ 25, 80, 0, { 0, 0, 0 } }, { 25, 80, 0, { 0, 0, 0 } },
}; };
#pragma asmproc recurse
#include "z_demo_im_cutscene_data.inc.c" #include "z_demo_im_cutscene_data.inc.c"
static DemoImActionFunc sActionFuncs[] = { static DemoImActionFunc sActionFuncs[] = {