Merge remote-tracking branch 'upstream/ique' into ique_update_headers

decompals · Apr 28, 2024 · 5af645f · 5af645f
2 parents cb2bcd5 + ade805e
commit 5af645f
Show file tree

Hide file tree

Showing 20 changed files with 2,218 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,5 +27,6 @@ tools/ido
 
 # Tool artifacts
 ctx.c
+ctx.c.m2c
 
 libultra_collection/
diff --git a/Makefile b/Makefile
@@ -141,7 +141,7 @@ endif
 
 # Try to find a file corresponding to an archive file in src/ or the base directory, prioritizing src then the original file
 AR_ORDER = $(foreach f,$(AR_OBJECTS),$(shell find $(BUILD_DIR)/src $(BASE_DIR) -iname $f -type f -print -quit))
-MATCHED_OBJS = $(filter-out $(BUILD_DIR)/$(BASE_DIR)/%,$(AR_ORDER))
+MATCHED_OBJS = $(filter-out $(BASE_DIR)/%,$(AR_ORDER))
 UNMATCHED_OBJS = $(filter-out $(MATCHED_OBJS),$(AR_ORDER))
 NUM_OBJS = $(words $(AR_ORDER))
 NUM_OBJS_MATCHED = $(words $(MATCHED_OBJS))