Build fixes

PrimeDecomp · Nov 30, 2023 · 04d06ae · 04d06ae
1 parent cb7c8e4
commit 04d06ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/configure.py b/configure.py
@@ -1194,7 +1194,7 @@ def Rel(lib_name, objects):
             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(NonMatching, "musyx/runtime/dolphin/hw_dspctrl.c"),
             Object(Matching, "musyx/runtime/hw_volconv.c"),
             Object(Matching, "musyx/runtime/snd3d.c"),
             Object(Matching, "musyx/runtime/snd_init.c"),

diff --git a/src/musyx/runtime/dolphin/hw_dolphin.c b/src/musyx/runtime/dolphin/hw_dolphin.c
@@ -140,8 +140,8 @@ void salStartDsp(u16* cmdList) {
     ;
 }
 
-void salCtrlDsp(u32 unk) {
-  salBuildCommandList(unk, salGetStartDelay());
+void salCtrlDsp(u16* dest) {
+  salBuildCommandList(dest, salGetStartDelay());
   salStartDsp(dspCmdList);
 }
 

diff --git a/src/musyx/runtime/hw_dspctrl.c → src/musyx/runtime/dolphin/hw_dspctrl.c b/src/musyx/runtime/hw_dspctrl.c → src/musyx/runtime/dolphin/hw_dspctrl.c
@@ -15,7 +15,10 @@
 
 
 */
-#include "musyx/musyx_priv.h"
+#include "musyx/assert.h"
+#include "musyx/dspvoice.h"
+#include "musyx/hardware.h"
+#include "musyx/sal.h"
 
 #ifdef _DEBUG
 static u32 dbgActiveVoicesMax = 0;