Convert MusyX to a submodule

PrimeDecomp · Dec 19, 2023 · 465620f · 465620f
1 parent 081a2fe
commit 465620f
Show file tree

Hide file tree

Showing 57 changed files with 50 additions and 18,298 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "extern/musyx"]
+	path = extern/musyx
+	url = [email protected]:AxioDL/musyx.git
diff --git a/configure.py b/configure.py
@@ -157,6 +157,7 @@
     "-str reuse",
     "-nosyspath",
     "-i include",
+    "-i extern/musyx/include",
     "-i libc",
     f"-i build/{config.version}/include",
     "-DPRIME1",
@@ -187,14 +188,15 @@
     "-gccinc",
     "-inline deferred,noauto",
     "-common on",
-    "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN"
+    "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN",
 ]
 
 cflags_musyx = [
     "-proc gekko",
     "-nodefaults",
     "-nosyspath",
     "-i include",
+    "-i extern/musyx/include",
     "-i libc",
     "-inline auto",
     "-O4,p",
@@ -203,7 +205,7 @@
     "-Cpp_exceptions off",
     "-str reuse,pool,readonly",
     "-fp_contract off",
-    "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN"
+    "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN",
 ]
 
 cflags_musyx_debug = [
@@ -212,13 +214,14 @@
     "-nodefaults",
     "-nosyspath",
     "-i include",
+    "-i extern/musyx/include",
     "-i libc",
     "-g",
     "-sym on",
     "-D_DEBUG=1",
     "-enum int",
     "-Cpp_exceptions off",
-    "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN"
+    "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN",
 ]
 
 # REL flags
@@ -1176,45 +1179,47 @@ def Rel(lib_name, objects):
         ],
     },
     MusyX(
-        #debug=True,
-        #mw_version="GC/1.2.5",
-        #major=1,
-        #minor=5,
-        #patch=3,
+        # debug=True,
+        # mw_version="GC/1.2.5",
+        # major=1,
+        # minor=5,
+        # patch=3,
         objects=[
-            Object(Matching, "musyx/runtime/seq.c"),
-            Object(Matching, "musyx/runtime/synth.c"),
-            Object(Matching, "musyx/runtime/seq_api.c"),
-            Object(Matching, "musyx/runtime/snd_synthapi.c"),
-            Object(NonMatching, "musyx/runtime/stream.c"),
-            Object(Matching, "musyx/runtime/synthdata.c"),
-            Object(NonMatching, "musyx/runtime/synthmacros.c"),
-            Object(Matching, "musyx/runtime/synthvoice.c"),
-            Object(Matching, "musyx/runtime/synth_ac.c"),
-            Object(Matching, "musyx/runtime/synth_adsr.c"),
-            Object(Matching, "musyx/runtime/synth_vsamples.c"),
-            Object(Matching, "musyx/runtime/synth_dbtab.c"),
-            Object(Matching, "musyx/runtime/s_data.c"),
-            Object(NonMatching, "musyx/runtime/hw_dspctrl.c"),
-            Object(Matching, "musyx/runtime/hw_volconv.c"),
-            Object(Matching, "musyx/runtime/snd3d.c"),
-            Object(Matching, "musyx/runtime/snd_init.c"),
-            Object(Matching, "musyx/runtime/snd_math.c"),
-            Object(NonMatching, "musyx/runtime/snd_midictrl.c"),
-            Object(Matching, "musyx/runtime/snd_service.c"),
-            Object(Matching, "musyx/runtime/hardware.c"),
-            Object(Matching, "musyx/runtime/hw_aramdma.c"),
-            Object(Matching, "musyx/runtime/dsp_import.c"),
-            Object(Matching, "musyx/runtime/hw_dolphin.c"),
-            Object(Matching, "musyx/runtime/hw_memory.c"),
-            Object(Matching, "musyx/runtime/hw_lib_dummy.c"),
-            Object(Matching, "musyx/runtime/CheapReverb/creverb_fx.c"),
-            Object(Matching, "musyx/runtime/CheapReverb/creverb.c"),
-            Object(Matching, "musyx/runtime/StdReverb/reverb_fx.c"),
-            Object(Matching, "musyx/runtime/StdReverb/reverb.c"),
-            Object(Matching, "musyx/runtime/Delay/delay_fx.c"),
-            Object(Matching, "musyx/runtime/Chorus/chorus_fx.c"),
-            Object(Matching, "musyx/runtime/dolphin/profile.c"),
+            Object(
+                Matching, "musyx/runtime/seq.c", source="extern/musyx/runtime/seq.c"
+            ),
+            Object(Matching, "musyx/runtime/synth.c", source="extern/musyx/synth.c"),
+            Object(Matching, "musyx/runtime/seq_api.c", source="extern/musyx/seq_api.c"),
+            Object(Matching, "musyx/runtime/snd_synthapi.c", source="extern/musyx/snd_synthapi.c"),
+            Object(NonMatching, "musyx/runtime/stream.c", source="extern/musyx/stream.c"),
+            Object(Matching, "musyx/runtime/synthdata.c", source="extern/musyx/synthdata.c"),
+            Object(NonMatching, "musyx/runtime/synthmacros.c", source="extern/musyx/synthmacros.c"),
+            Object(Matching, "musyx/runtime/synthvoice.c", source="extern/musyx/synthvoice.c"),
+            Object(Matching, "musyx/runtime/synth_ac.c", source="extern/musyx/synth_ac.c"),
+            Object(Matching, "musyx/runtime/synth_adsr.c", source="extern/musyx/synth_adsr.c"),
+            Object(Matching, "musyx/runtime/synth_vsamples.c", source="extern/musyx/synth_vsamples.c"),
+            Object(Matching, "musyx/runtime/synth_dbtab.c", source="extern/musyx/synth_dbtab.c"),
+            Object(Matching, "musyx/runtime/s_data.c", source="extern/musyx/s_data.c"),
+            Object(NonMatching, "musyx/runtime/hw_dspctrl.c", source="extern/musyx/hw_dspctrl.c"),
+            Object(Matching, "musyx/runtime/hw_volconv.c", source="extern/musyx/hw_volconv.c"),
+            Object(Matching, "musyx/runtime/snd3d.c", source="extern/musyx/snd3d.c"),
+            Object(Matching, "musyx/runtime/snd_init.c", source="extern/musyx/snd_init.c"),
+            Object(Matching, "musyx/runtime/snd_math.c", source="extern/musyx/snd_math.c"),
+            Object(NonMatching, "musyx/runtime/snd_midictrl.c", source="extern/musyx/snd_midictrl.c"),
+            Object(Matching, "musyx/runtime/snd_service.c", source="extern/musyx/snd_service.c"),
+            Object(Matching, "musyx/runtime/hardware.c", source="extern/musyx/hardware.c"),
+            Object(Matching, "musyx/runtime/hw_aramdma.c", source="extern/musyx/hw_aramdma.c"),
+            Object(Matching, "musyx/runtime/dsp_import.c", source="extern/musyx/dsp_import.c"),
+            Object(Matching, "musyx/runtime/hw_dolphin.c", source="extern/musyx/hw_dolphin.c"),
+            Object(Matching, "musyx/runtime/hw_memory.c", source="extern/musyx/hw_memory.c"),
+            Object(Matching, "musyx/runtime/hw_lib_dummy.c", source="extern/musyx/hw_lib_dummy.c"),
+            Object(Matching, "musyx/runtime/CheapReverb/creverb_fx.c", source="extern/musyx/creverb_fx.c"),
+            Object(Matching, "musyx/runtime/CheapReverb/creverb.c", source="extern/musyx/creverb.c"),
+            Object(Matching, "musyx/runtime/StdReverb/reverb_fx.c", source="extern/musyx/reverb_fx.c"),
+            Object(Matching, "musyx/runtime/StdReverb/reverb.c", source="extern/musyx/reverb.c"),
+            Object(Matching, "musyx/runtime/Delay/delay_fx.c", source="extern/musyx/delay_fx.c"),
+            Object(Matching, "musyx/runtime/Chorus/chorus_fx.c", source="extern/musyx/chorus_fx.c"),
+            Object(Matching, "musyx/runtime/profile.c", source="extern/musyx/profile.c"),
         ],
     ),
     {

diff --git a/extern/musyx b/extern/musyx
diff --git a/include/musyx/adsr.h b/include/musyx/adsr.h
diff --git a/include/musyx/assert.h b/include/musyx/assert.h
diff --git a/include/musyx/dsp_import.h b/include/musyx/dsp_import.h