From 0a48548da7ec8ede4e9a3d935e515ae109d67521 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Mon, 17 Jan 2022 18:42:33 -0500 Subject: [PATCH] Extract z_select_static (#1074) * merge master * z_select_static OK * remove jenkins file * missed a DL * Update z_select_static.xml * new ZAPD --- Makefile | 2 ++ assets/xml/misc/z_select_static.xml | 40 +++++++++++++++++++++++++++++ include/ultra64/gbi.h | 4 ++- spec | 3 ++- 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 assets/xml/misc/z_select_static.xml diff --git a/Makefile b/Makefile index 276eda320e..bcd822d4b8 100644 --- a/Makefile +++ b/Makefile @@ -150,6 +150,8 @@ build/src/libultra/libc/%.o: OPTFLAGS := -O2 build/src/libultra/rmon/%.o: OPTFLAGS := -O2 build/src/libultra/gu/%.o: OPTFLAGS := -O2 +build/assets/misc/z_select_static/%.o: CFLAGS += -DF3DEX_GBI + build/src/libultra/gu/%.o: CC := $(CC_OLD) build/src/libultra/io/%.o: CC := $(CC_OLD) build/src/libultra/libc/%.o: CC := $(CC_OLD) diff --git a/assets/xml/misc/z_select_static.xml b/assets/xml/misc/z_select_static.xml new file mode 100644 index 0000000000..63844e86da --- /dev/null +++ b/assets/xml/misc/z_select_static.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index a36d79666f..82b3589ae2 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -10,7 +10,9 @@ /* Private macro to wrap other macros in do {...} while (0) */ #define _DW(macro) do {macro} while (0) -#define F3DEX_GBI_2 +#ifndef F3DEX_GBI + #define F3DEX_GBI_2 +#endif #ifdef F3DEX_GBI_2 # ifndef F3DEX_GBI diff --git a/spec b/spec index a780a42b38..25cedb22f8 100644 --- a/spec +++ b/spec @@ -6384,7 +6384,8 @@ endseg beginseg name "z_select_static" romalign 0x1000 - include "build/baserom/z_select_static.o" + include "build/assets/misc/z_select_static/z_select_static.o" + number 1 endseg beginseg