From 116db5fe812b3d4b343c513272bf4b9bdc38a989 Mon Sep 17 00:00:00 2001 From: dbalatoni13 Date: Tue, 17 Dec 2024 04:48:47 +0100 Subject: [PATCH] Update musyx and set it to matching --- configure.py | 27 ++++++++++++++++++++++----- extern/musyx | 2 +- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/configure.py b/configure.py index 4e80312b..eae7d004 100644 --- a/configure.py +++ b/configure.py @@ -278,6 +278,23 @@ cflags_musyx = [ "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN", ] +cflags_musyx_debug = [ + "-proc gecko", + "-fp hard", + "-nodefaults", + "-nosyspath", + "-i include", + "-i extern/musyx/include", + "-i libc", + "-g", + "-sym on", + "-D_DEBUG=1", + "-fp hard", + "-enum int", + "-Cpp_exceptions off", + "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN", +] + # REL flags cflags_rel = [ *cflags_base, @@ -736,21 +753,21 @@ config.libs = [ Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synth.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/seq_api.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/snd_synthapi.c"), - Object(NonMatching, "musyx/runtime/stream.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/stream.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synthdata.c"), - Object(NonMatching, "musyx/runtime/synthmacros.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synthmacros.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synthvoice.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synth_ac.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synth_dbtab.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synth_adsr.c"), - Object(NonMatching, "musyx/runtime/synth_vsamples.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/synth_vsamples.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/s_data.c"), - Object(NonMatching, "musyx/runtime/hw_dspctrl.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/hw_dspctrl.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/hw_volconv.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/snd3d.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/snd_init.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/snd_math.c"), - Object(NonMatching, "musyx/runtime/snd_midictrl.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/snd_midictrl.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/snd_service.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/hardware.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "musyx/runtime/dsp_import.c"), diff --git a/extern/musyx b/extern/musyx index ddfad60c..a170f2ef 160000 --- a/extern/musyx +++ b/extern/musyx @@ -1 +1 @@ -Subproject commit ddfad60c3e4fede55479c744a1c70081e0d6cd12 +Subproject commit a170f2ef4a3f51edb89bc792dff79d55b2c42a89