From 732ff1447112bf779238f776a0a8a07b3ce06f9f Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 17 Apr 2022 21:35:01 -0700 Subject: [PATCH] Update make files Former-commit-id: 2fb5f09e6c12e79ea1af593cc3921c0d149cc762 --- Makefile | 3 +-- obj_files.mk | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f0007cb7..80c823a3 100644 --- a/Makefile +++ b/Makefile @@ -54,8 +54,7 @@ endif O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(METROTRK_FILES) \ $(METROIDPRIME) $(WORLDFORMAT) $(WEAPONS) $(METARENDER) $(GUISYS) $(COLLISION) \ - $(KYOTO) $(RODATA_O_FILES) $(DATA_O_FILES) $(SDATA_O_FILES) \ - $(SBSS_O_FILES) $(SDATA2_O_FILES) $(SBSS2_O_FILES) $(AI_FILES) \ + $(KYOTO) $(RODATA_O_FILES) $(SDATA_O_FILES) $(SBSS_O_FILES) $(SDATA2_O_FILES) $(AI_FILES) \ $(AR_FILES) $(BASE_FILES) $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) \ $(OS_FILES) $(PAD_FILES) $(VI_FILES) $(MSL_PPCEABI_BARE_H) $(MUSYX_FILES) \ $(DTK_FILES) $(CARD_FILES) $(SI_FILES) $(EXI_FILES) $(THP_FILES) \ diff --git a/obj_files.mk b/obj_files.mk index 705a3810..15624d68 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -872,9 +872,6 @@ DTORS_O_FILES :=\ RODATA_O_FILES :=\ $(BUILD_DIR)/asm/rodata.o -DATA_O_FILES :=\ - $(BUILD_DIR)/asm/data.o - SDATA_O_FILES :=\ $(BUILD_DIR)/asm/sdata.o @@ -884,5 +881,3 @@ SBSS_O_FILES :=\ SDATA2_O_FILES :=\ $(BUILD_DIR)/asm/sdata2.o -SBSS2_O_FILES :=\ - $(BUILD_DIR)/asm/sbss2.o