summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax <mparisi@stevens.edu>2020-10-07 12:08:17 -0400
committerMax <mparisi@stevens.edu>2020-10-07 12:08:17 -0400
commit3394a98df4c1293aced048294c0ae5b99f9eb155 (patch)
tree6428d37cb2c2a2cb9ee1a9a4208dd9a6318b9d5f
parent6d51128c2d862ea00439c8881858fb0bd0821e21 (diff)
move AXFX assembly files to a separate AXFX folder
-rw-r--r--Makefile4
-rw-r--r--asm/SDK/AXFX/AXFXChorus.s (renamed from asm/SDK/AX/AXFXChorus.s)0
-rw-r--r--asm/SDK/AXFX/AXFXChorusExp.s (renamed from asm/SDK/AX/AXFXChorusExp.s)0
-rw-r--r--asm/SDK/AXFX/AXFXDelay.s (renamed from asm/SDK/AX/AXFXDelay.s)0
-rw-r--r--asm/SDK/AXFX/AXFXHooks.s (renamed from asm/SDK/AX/AXFXHooks.s)0
-rw-r--r--asm/SDK/AXFX/AXFXLfoTable.s (renamed from asm/SDK/AX/AXFXLfoTable.s)0
-rw-r--r--asm/SDK/AXFX/AXFXReverbHi.s (renamed from asm/SDK/AX/AXFXReverbHi.s)0
-rw-r--r--asm/SDK/AXFX/AXFXReverbHiDpl2.s (renamed from asm/SDK/AX/AXFXReverbHiDpl2.s)0
-rw-r--r--asm/SDK/AXFX/AXFXReverbHiExp.s (renamed from asm/SDK/AX/AXFXReverbHiExp.s)0
-rw-r--r--asm/SDK/AXFX/AXFXReverbHiExpDpl2.s (renamed from asm/SDK/AX/AXFXReverbHiExpDpl2.s)0
-rw-r--r--asm/SDK/AXFX/AXFXReverbStd.s (renamed from asm/SDK/AX/AXFXReverbStd.s)0
-rw-r--r--asm/SDK/AXFX/AXFXReverbStdExp.s (renamed from asm/SDK/AX/AXFXReverbStdExp.s)0
-rw-r--r--asm/SDK/AXFX/AXFXSrcCoef.s (renamed from asm/SDK/AX/AXFXSrcCoef.s)0
-rw-r--r--obj_files.mk24
14 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 5052aaa..9fecab5 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ TARGET := pbr_pal
BUILD_DIR := build/$(TARGET)
SRC_DIRS := src src/SDK/OS src/SDK/EXI src/SDK/SI src/SDK/DB src/SDK/VI src/SDK/MTX \
- src/SDK/GX src/SDK/DVD src/SDK/AI src/SDK/AX src/SDK/MEM src/SDK/MIX src/SDK/DSP \
+ src/SDK/GX src/SDK/DVD src/SDK/AI src/SDK/AX src/SDK/AXFX src/SDK/MEM src/SDK/MIX src/SDK/DSP \
src/SDK/TPL src/SDK/THP src/SDK/KPAD src/SDK/PAD src/SDK/WPAD src/SDK/FS src/SDK/IPC \
src/SDK/NdevExi2A src/SDK/USB src/SDK/EUART src/SDK/WUD src/SDK/BTE src/SDK/NAND src/SDK/SC src/SDK/base \
src/SDK/HBM src/MSL_C/MSL_Common src/MSL_C/MSL_Common_Embedded \
@@ -37,7 +37,7 @@ SRC_DIRS := src src/SDK/OS src/SDK/EXI src/SDK/SI src/SDK/DB src/SDK/VI src/SDK/
src/MetroTRK src/GameSpy src/nw4r/ut src/nw4r/snd src/nw4r/ut/detail \
src/nw4r/snd/detail src/nw4r/math src/nw4r/lyt src/nw4r/lyt/detail
ASM_DIRS := asm asm/SDK/OS asm/SDK/EXI asm/SDK/SI asm/SDK/DB asm/SDK/VI asm/SDK/MTX \
- asm/SDK/GX asm/SDK/DVD asm/SDK/AI asm/SDK/AX asm/SDK/MEM asm/SDK/MIX asm/SDK/DSP \
+ asm/SDK/GX asm/SDK/DVD asm/SDK/AI asm/SDK/AX asm/SDK/AXFX asm/SDK/MEM asm/SDK/MIX asm/SDK/DSP \
asm/SDK/TPL asm/SDK/THP asm/SDK/KPAD asm/SDK/PAD asm/SDK/WPAD asm/SDK/FS asm/SDK/IPC \
asm/SDK/NdevExi2A asm/SDK/USB asm/SDK/EUART asm/SDK/WUD asm/SDK/BTE asm/SDK/NAND asm/SDK/SC asm/SDK/base \
asm/SDK/HBM asm/MSL_C/MSL_Common asm/MSL_C/MSL_Common_Embedded \
diff --git a/asm/SDK/AX/AXFXChorus.s b/asm/SDK/AXFX/AXFXChorus.s
index 9e10570..9e10570 100644
--- a/asm/SDK/AX/AXFXChorus.s
+++ b/asm/SDK/AXFX/AXFXChorus.s
diff --git a/asm/SDK/AX/AXFXChorusExp.s b/asm/SDK/AXFX/AXFXChorusExp.s
index 524aee1..524aee1 100644
--- a/asm/SDK/AX/AXFXChorusExp.s
+++ b/asm/SDK/AXFX/AXFXChorusExp.s
diff --git a/asm/SDK/AX/AXFXDelay.s b/asm/SDK/AXFX/AXFXDelay.s
index f9ba3b2..f9ba3b2 100644
--- a/asm/SDK/AX/AXFXDelay.s
+++ b/asm/SDK/AXFX/AXFXDelay.s
diff --git a/asm/SDK/AX/AXFXHooks.s b/asm/SDK/AXFX/AXFXHooks.s
index d4f6340..d4f6340 100644
--- a/asm/SDK/AX/AXFXHooks.s
+++ b/asm/SDK/AXFX/AXFXHooks.s
diff --git a/asm/SDK/AX/AXFXLfoTable.s b/asm/SDK/AXFX/AXFXLfoTable.s
index dbaffe5..dbaffe5 100644
--- a/asm/SDK/AX/AXFXLfoTable.s
+++ b/asm/SDK/AXFX/AXFXLfoTable.s
diff --git a/asm/SDK/AX/AXFXReverbHi.s b/asm/SDK/AXFX/AXFXReverbHi.s
index 1290e6c..1290e6c 100644
--- a/asm/SDK/AX/AXFXReverbHi.s
+++ b/asm/SDK/AXFX/AXFXReverbHi.s
diff --git a/asm/SDK/AX/AXFXReverbHiDpl2.s b/asm/SDK/AXFX/AXFXReverbHiDpl2.s
index 00e9124..00e9124 100644
--- a/asm/SDK/AX/AXFXReverbHiDpl2.s
+++ b/asm/SDK/AXFX/AXFXReverbHiDpl2.s
diff --git a/asm/SDK/AX/AXFXReverbHiExp.s b/asm/SDK/AXFX/AXFXReverbHiExp.s
index 08b5842..08b5842 100644
--- a/asm/SDK/AX/AXFXReverbHiExp.s
+++ b/asm/SDK/AXFX/AXFXReverbHiExp.s
diff --git a/asm/SDK/AX/AXFXReverbHiExpDpl2.s b/asm/SDK/AXFX/AXFXReverbHiExpDpl2.s
index a92d28f..a92d28f 100644
--- a/asm/SDK/AX/AXFXReverbHiExpDpl2.s
+++ b/asm/SDK/AXFX/AXFXReverbHiExpDpl2.s
diff --git a/asm/SDK/AX/AXFXReverbStd.s b/asm/SDK/AXFX/AXFXReverbStd.s
index 228d31c..228d31c 100644
--- a/asm/SDK/AX/AXFXReverbStd.s
+++ b/asm/SDK/AXFX/AXFXReverbStd.s
diff --git a/asm/SDK/AX/AXFXReverbStdExp.s b/asm/SDK/AXFX/AXFXReverbStdExp.s
index 1e45b00..1e45b00 100644
--- a/asm/SDK/AX/AXFXReverbStdExp.s
+++ b/asm/SDK/AXFX/AXFXReverbStdExp.s
diff --git a/asm/SDK/AX/AXFXSrcCoef.s b/asm/SDK/AXFX/AXFXSrcCoef.s
index cc3debe..cc3debe 100644
--- a/asm/SDK/AX/AXFXSrcCoef.s
+++ b/asm/SDK/AXFX/AXFXSrcCoef.s
diff --git a/obj_files.mk b/obj_files.mk
index 026c663..156f86f 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -190,18 +190,18 @@ TEXT_O_FILES := \
$(BUILD_DIR)/asm/SDK/AX/AXSPB.o \
$(BUILD_DIR)/asm/SDK/AX/AXVPB.o \
$(BUILD_DIR)/asm/SDK/AX/AXProf.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXReverbHi.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXReverbHiDpl2.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXReverbHiExp.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXReverbHiExpDpl2.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXDelay.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXReverbStd.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXReverbStdExp.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXChorus.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXChorusExp.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXLfoTable.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXSrcCoef.o \
- $(BUILD_DIR)/asm/SDK/AX/AXFXHooks.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXReverbHi.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXReverbHiDpl2.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXReverbHiExp.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXReverbHiExpDpl2.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXDelay.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXReverbStd.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXReverbStdExp.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXChorus.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXChorusExp.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXLfoTable.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXSrcCoef.o \
+ $(BUILD_DIR)/asm/SDK/AXFX/AXFXHooks.o \
$(BUILD_DIR)/asm/SDK/MEM/mem_heapCommon.o \
$(BUILD_DIR)/asm/SDK/MEM/mem_expHeap.o \
$(BUILD_DIR)/asm/SDK/MEM/mem_frameHeap.o \