Update musyx, Match and link snd_midictrl

PrimeDecomp · Dec 16, 2024 · 10d6750 · 10d6750
1 parent cecf730
commit 10d6750
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/configure.py b/configure.py
@@ -250,6 +250,7 @@
     "-O4,p",
     "-fp hard",
     "-enum int",
+    "-sym on",
     "-Cpp_exceptions off",
     "-str reuse,pool,readonly",
     "-fp_contract off",
@@ -1265,11 +1266,11 @@ def MatchingFor(*versions):
         ],
     },
     MusyX(
-        # debug=True,
-        # mw_version="GC/1.2.5",
-        # major=1,
-        # minor=5,
-        # patch=3,
+        #debug=True,
+        #mw_version="GC/1.2.5n",
+        #major=1,
+        #minor=5,
+        #patch=3,
         objects=[
             Object(Matching, "musyx/runtime/seq.c"),
             Object(Matching, "musyx/runtime/synth.c"),
@@ -1289,7 +1290,7 @@ def MatchingFor(*versions):
             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_midictrl.c"),
             Object(Matching, "musyx/runtime/snd_service.c"),
             Object(Matching, "musyx/runtime/hardware.c"),
             Object(Matching, "musyx/runtime/hw_aramdma.c"),

diff --git a/extern/musyx b/extern/musyx
+7 −0		include/musyx/sal.h
+18 −10		src/musyx/runtime/hw_dspctrl.c
+111 −31		src/musyx/runtime/snd_midictrl.c
+1 −1		src/musyx/runtime/stream.c
+0 −1		src/musyx/runtime/synthvoice.c