Move many files to a config folder

.gitignore

@@ -3,13 +3,6 @@ asm/
 bin/
 build/
 
-linker_scripts/us/auto/
-linker_scripts/cn/auto/
-*_auto.ld
-drmario64.ld
-drmario64.d
-linker_scripts/*/partial/
-
 __pycache__/
 .venv/
 

Makefile

@@ -45,8 +45,8 @@ CROSS ?= mips-linux-gnu-
 
 VERSION ?= us
 
-BASEROM              := baserom.$(VERSION).z64
-BASEROM_UNCOMPRESSED := baserom_uncompressed.$(VERSION).z64
+BASEROM              := config/$(VERSION)/baserom.$(VERSION).z64
+BASEROM_UNCOMPRESSED := config/$(VERSION)/baserom_uncompressed.$(VERSION).z64
 TARGET               := drmario64
 
 
@@ -129,7 +129,7 @@ else
 endif
 
 SPLAT             ?= python3 -m splat split
-SPLAT_YAML        ?= $(TARGET).$(VERSION).yaml
+SPLAT_YAML        ?= config/$(VERSION)/$(TARGET).$(VERSION).yaml
 
 SPLAT_FLAGS       ?=
 ifneq ($(FULL_DISASM),0)
@@ -137,7 +137,7 @@ ifneq ($(FULL_DISASM),0)
 endif
 
 SLINKY            ?= tools/slinky/slinky-cli
-SLINKY_YAML       ?= slinky.yaml
+SLINKY_YAML       ?= config/slinky.yaml
 
 SLINKY_FLAGS      ?=
 ifneq ($(PARTIAL_LINKING),0)
@@ -234,7 +234,7 @@ endif
 
 #### Files ####
 
-$(shell mkdir -p asm bin linker_scripts/$(VERSION)/auto)
+$(shell mkdir -p asm bin)
 
 SRC_DIRS      := $(shell find src -type d)
 ASM_DIRS      := $(shell find asm/$(VERSION) -type d -not -path "asm/$(VERSION)/nonmatchings/*" -not -path "asm/$(VERSION)/lib/*")
@@ -274,7 +274,7 @@ ifneq ($(DEP_INCLUDE), 0)
 endif
 
 # create build directories
-$(shell mkdir -p $(BUILD_DIR)/linker_scripts/$(VERSION) $(BUILD_DIR)/linker_scripts/$(VERSION)/auto $(BUILD_DIR)/segments)
+$(shell mkdir -p $(BUILD_DIR)/linker_scripts/$(VERSION) $(BUILD_DIR)/segments)
 $(shell mkdir -p $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(BIN_DIRS) $(LIBULTRA_DIRS) $(LIBMUS_DIRS),$(BUILD_DIR)/$(dir)))
 
 # directory flags
@@ -314,13 +314,13 @@ all: compressed
 uncompressed: $(ROM)
 ifneq ($(COMPARE),0)
 	@md5sum $(ROM)
-	@md5sum -c $(TARGET)_uncompressed.$(VERSION).md5
+	@md5sum -c config/$(VERSION)/$(TARGET)_uncompressed.$(VERSION).md5
 endif
 
 compressed: $(ROMC)
 ifneq ($(COMPARE),0)
 	@md5sum $(ROMC)
-	@md5sum -c $(TARGET).$(VERSION).md5
+	@md5sum -c config/$(VERSION)/$(TARGET).$(VERSION).md5
 endif
 
 clean:
@@ -331,7 +331,6 @@ libclean:
 
 distclean: clean
 	$(RM) -r $(BUILD_DIR) asm/ bin/ .splat/
-	$(RM) -r linker_scripts/$(VERSION)/auto
 	$(MAKE) -C tools distclean
 
 setup:
@@ -390,8 +389,6 @@ asset_files: $(PNG_INC_FILES)
 $(O_FILES): | asset_files
 msg_files: $(TEXT_INC_FILES)
 $(O_FILES): | msg_files
-o_files: $(O_FILES)
-$(SEGMENTS_O): | o_files
 
 asset_files_clean:
 	$(RM) -r $(PNG_INC_FILES)

config/cn/drmario64.cn.yaml

@@ -2,24 +2,24 @@ name: Dr.Mario 64 (China)
 sha1: 82c995b76a118c4a8a4cef558c2ef7062b3de528
 options:
   basename: drmario64
-  target_path: baserom_uncompressed.cn.z64
+  target_path: config/cn/baserom_uncompressed.cn.z64
   elf_path: build/cn/drmario64.cn.elf
-  ld_script_path: linker_scripts/cn/drmario64.ld
-  base_path: .
+  ld_script_path: .splat/cn/drmario64.ld
+  base_path: ../../
   compiler: GCC
   find_file_boundaries: True
   header_encoding: ASCII
   platform: n64
-  undefined_funcs_auto_path: linker_scripts/cn/auto/undefined_funcs_auto.ld
-  undefined_syms_auto_path: linker_scripts/cn/auto/undefined_syms_auto.ld
+  undefined_funcs_auto_path: .splat/cn/auto/undefined_funcs_auto.ld
+  undefined_syms_auto_path: .splat/cn/auto/undefined_syms_auto.ld
   symbol_addrs_path:
-    - linker_scripts/cn/symbol_addrs_boot.txt
-    - linker_scripts/cn/symbol_addrs_dma_table.txt
-    - linker_scripts/cn/symbol_addrs_main_segment.txt
-    - linker_scripts/cn/symbol_addrs_buffers.txt
-    - linker_scripts/cn/ignored_addresses.txt
+    - config/cn/symbol_addrs/symbol_addrs_boot.txt
+    - config/cn/symbol_addrs/symbol_addrs_dma_table.txt
+    - config/cn/symbol_addrs/symbol_addrs_main_segment.txt
+    - config/cn/symbol_addrs/symbol_addrs_buffers.txt
+    - config/cn/symbol_addrs/ignored_addresses.txt
   reloc_addrs_path:
-    - relocs/reloc_addrs.cn.txt
+    - config/cn/relocs/reloc_addrs.cn.txt
 
   auto_all_sections: [".data", ".rodata", ".bss"]
 
@@ -88,7 +88,7 @@ options:
 
   ld_dependencies: True
   ld_partial_linking: False
-  ld_partial_scripts_path: linker_scripts/cn/partial
+  ld_partial_scripts_path: .splat/cn/partial
   ld_partial_build_segments_path: build/cn/segments
 
   ld_wildcard_sections: True
@@ -102,8 +102,6 @@ options:
   hasm_in_src_path: True
 
   mips_abi_float_regs: o32
-  # mips_abi_gpr: numeric
-  # mips_abi_float_regs: numeric
   do_c_func_detection: True
   o_as_suffix: True
   gfx_ucode: f3dex2

config/gw/drmario64.gw.yaml

@@ -2,25 +2,25 @@ name: Dr.Mario 64 (Gateway 64 (NTSC))
 sha1: c71398ec500763b563f065c9eea61d47025b66ba
 options:
   basename: drmario64
-  target_path: baserom_uncompressed.gw.z64
+  target_path: config/gw/baserom_uncompressed.gw.z64
   elf_path: build/gw/drmario64.gw.elf
-  ld_script_path: linker_scripts/gw/drmario64.ld
-  base_path: .
+  ld_script_path: .splat/gw/drmario64.ld
+  base_path: ../../
   compiler: GCC
   find_file_boundaries: True
   header_encoding: ASCII
   platform: n64
-  undefined_funcs_auto_path: linker_scripts/gw/auto/undefined_funcs_auto.ld
-  undefined_syms_auto_path: linker_scripts/gw/auto/undefined_syms_auto.ld
+  undefined_funcs_auto_path: .splat/gw/auto/undefined_funcs_auto.ld
+  undefined_syms_auto_path: .splat/gw/auto/undefined_syms_auto.ld
   symbol_addrs_path:
-    - linker_scripts/gw/symbol_addrs_boot.txt
-    - linker_scripts/gw/symbol_addrs_libultra.txt
-    - linker_scripts/gw/symbol_addrs_dma_table.txt
-    - linker_scripts/gw/symbol_addrs_main_segment.txt
-    - linker_scripts/gw/symbol_addrs_buffers.txt
-    - linker_scripts/gw/ignored_addresses.txt
+    - config/gw/symbol_addrs/symbol_addrs_boot.txt
+    - config/gw/symbol_addrs/symbol_addrs_libultra.txt
+    - config/gw/symbol_addrs/symbol_addrs_dma_table.txt
+    - config/gw/symbol_addrs/symbol_addrs_main_segment.txt
+    - config/gw/symbol_addrs/symbol_addrs_buffers.txt
+    - config/gw/symbol_addrs/ignored_addresses.txt
   reloc_addrs_path:
-    - relocs/reloc_addrs.gw.txt
+    - config/gw/relocs/reloc_addrs.gw.txt
 
   auto_all_sections: [".data", ".rodata", ".bss"]
 
@@ -89,7 +89,7 @@ options:
 
   ld_dependencies: True
   ld_partial_linking: False
-  ld_partial_scripts_path: linker_scripts/gw/partial
+  ld_partial_scripts_path: .splat/gw/partial
   ld_partial_build_segments_path: build/gw/segments
 
   ld_wildcard_sections: True

config/us/drmario64.us.yaml

@@ -2,24 +2,24 @@ name: Dr.Mario 64 (North America)
 sha1: 96ba0ce2f9e98e5790df120320cd3d1a3d7080d2
 options:
   basename: drmario64
-  target_path: baserom_uncompressed.us.z64
+  target_path: config/us/baserom_uncompressed.us.z64
   elf_path: build/us/drmario64.us.elf
-  ld_script_path: linker_scripts/us/drmario64.ld
-  base_path: .
+  ld_script_path: .splat/us/drmario64.ld
+  base_path: ../../
   compiler: GCC
   find_file_boundaries: True
   header_encoding: ASCII
   platform: n64
-  undefined_funcs_auto_path: linker_scripts/us/auto/undefined_funcs_auto.ld
-  undefined_syms_auto_path: linker_scripts/us/auto/undefined_syms_auto.ld
+  undefined_funcs_auto_path: .splat/us/auto/undefined_funcs_auto.ld
+  undefined_syms_auto_path: .splat/us/auto/undefined_syms_auto.ld
   symbol_addrs_path:
-    - linker_scripts/us/symbol_addrs_boot.txt
-    - linker_scripts/us/symbol_addrs_dma_table.txt
-    - linker_scripts/us/symbol_addrs_main_segment.txt
-    - linker_scripts/us/symbol_addrs_buffers.txt
-    - linker_scripts/us/ignored_addresses.txt
+    - config/us/symbol_addrs/symbol_addrs_boot.txt
+    - config/us/symbol_addrs/symbol_addrs_dma_table.txt
+    - config/us/symbol_addrs/symbol_addrs_main_segment.txt
+    - config/us/symbol_addrs/symbol_addrs_buffers.txt
+    - config/us/symbol_addrs/ignored_addresses.txt
   reloc_addrs_path:
-    - relocs/reloc_addrs.us.txt
+    - config/us/relocs/reloc_addrs.us.txt
 
   auto_all_sections: [".data", ".rodata", ".bss"]
 
@@ -88,7 +88,7 @@ options:
 
   ld_dependencies: True
   ld_partial_linking: False
-  ld_partial_scripts_path: linker_scripts/us/partial
+  ld_partial_scripts_path: .splat/us/partial
   ld_partial_build_segments_path: build/us/segments
 
   ld_wildcard_sections: True