Autos gawn (#1153)

* working on it * ique brok * Autos gawn (#1152) * ique builds * Yeet most `auto, .data` from ique * us dun --------- Co-authored-by: angie <[email protected]> * update shplort * fix configure * requests --------- Co-authored-by: angie <[email protected]>
pmret · Jan 20, 2024 · f89df67 · f89df67
1 parent bfe9a42
commit f89df67
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 700 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -13,4 +13,5 @@ rabbitizer
 n64img
 python-githooks
 crunch64>=0.2.0
-splat64>=0.21.0
+splat64>=0.21.4
+requests
diff --git a/src/os/nusys/nugfxfuncset.c b/src/os/nusys/nugfxfuncset.c
@@ -1,9 +1,6 @@
 #include "common.h"
 #include "nu/nusys.h"
 
-NUGfxFunc nuGfxFunc = NULL;
-NUGfxPreNMIFunc nuGfxPreNMIFunc = NULL;
-
 void nuGfxFuncSet(NUGfxFunc func) {
     OSIntMask intMask;
 

diff --git a/src/os/nusys/nugfxthread.c b/src/os/nusys/nugfxthread.c
@@ -3,6 +3,9 @@
 
 void gfxThread(void*);
 
+NUGfxFunc nuGfxFunc = NULL;
+NUGfxPreNMIFunc nuGfxPreNMIFunc = NULL;
+
 extern char GfxStack[NU_GFX_STACK_SIZE];
 extern OSThread D_800B1B90;
 extern OSMesg nuGfxMesgBuf[NU_GFX_MESGS];

diff --git a/tools/build/configure.py b/tools/build/configure.py
@@ -625,7 +625,9 @@ def build(
             if isinstance(seg, splat.segtypes.n64.header.N64SegHeader):
                 build(entry.object_path, entry.src_paths, "as")
             elif isinstance(seg, splat.segtypes.common.asm.CommonSegAsm) or (
-                isinstance(seg, splat.segtypes.common.data.CommonSegData) and not seg.type[0] == "."
+                isinstance(seg, splat.segtypes.common.data.CommonSegData)
+                and not seg.type[0] == "."
+                or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin)
             ):
                 build(entry.object_path, entry.src_paths, "as")
             elif seg.type in ["pm_effect_loads", "pm_effect_shims"]:
@@ -783,11 +785,7 @@ def build(
                                 type="data",
                                 define=True,
                             )
-            elif (
-                isinstance(seg, splat.segtypes.common.bin.CommonSegBin)
-                or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin)
-                or isinstance(seg, splat.segtypes.common.rodatabin.CommonSegRodatabin)
-            ):
+            elif isinstance(seg, splat.segtypes.common.bin.CommonSegBin):
                 build(entry.object_path, entry.src_paths, "bin")
             elif isinstance(seg, splat.segtypes.n64.yay0.N64SegYay0):
                 compressed_path = entry.object_path.with_suffix("")  # remove .o