diff --git a/configure.py b/configure.py index a7d06e7f..042bbe88 100644 --- a/configure.py +++ b/configure.py @@ -271,7 +271,7 @@ def DolphinLib(lib_name, objects): "objects": objects, } -def MusyX(objects, mw_version="GC/2.6", debug=False, major=2, minor=0, patch=0): +def MusyX(objects, mw_version="GC/1.3.2", debug=False, major=1, minor=5, patch=4): cflags = cflags_musyx if not debug else cflags_musyx_debug return { "lib": "musyx", @@ -665,34 +665,34 @@ config.libs = [ MusyX( objects={ Object(Matching, "musyx/runtime/seq.c"), - Object(NonMatching, "musyx/runtime/synth.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(NonMatching, "musyx/runtime/synthvoice.c"), + Object(Matching, "musyx/runtime/synthvoice.c"), Object(Matching, "musyx/runtime/synth_ac.c"), Object(Matching, "musyx/runtime/synth_dbtab.c"), - Object(NonMatching, "musyx/runtime/synth_adsr.c"), + Object(Matching, "musyx/runtime/synth_adsr.c"), Object(NonMatching, "musyx/runtime/synth_vsamples.c"), - Object(NonMatching, "musyx/runtime/s_data.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(NonMatching, "musyx/runtime/snd_math.c"), + Object(Matching, "musyx/runtime/snd_math.c"), Object(NonMatching, "musyx/runtime/snd_midictrl.c"), - Object(NonMatching, "musyx/runtime/snd_service.c"), + Object(Matching, "musyx/runtime/snd_service.c"), Object(Matching, "musyx/runtime/hardware.c"), Object(Matching, "musyx/runtime/dsp_import.c"), Object(Matching, "musyx/runtime/hw_aramdma.c"), Object(Matching, "musyx/runtime/hw_dolphin.c"), Object(Matching, "musyx/runtime/hw_memory.c"), Object(Matching, "musyx/runtime/CheapReverb/creverb_fx.c"), - Object(NonMatching, "musyx/runtime/CheapReverb/creverb.c"), + Object(Matching, "musyx/runtime/CheapReverb/creverb.c"), Object(Matching, "musyx/runtime/StdReverb/reverb_fx.c"), - Object(NonMatching, "musyx/runtime/StdReverb/reverb.c"), + Object(Matching, "musyx/runtime/StdReverb/reverb.c"), Object(Matching, "musyx/runtime/Delay/delay_fx.c"), Object(Matching, "musyx/runtime/Chorus/chorus_fx.c"), } diff --git a/include/math.h b/include/math.h index db5ce270..3a508d50 100644 --- a/include/math.h +++ b/include/math.h @@ -36,6 +36,7 @@ double asin(double x); double atan2(double y, double x); double fmod(double x, double y); double log(double x); +double pow(double x, double y); float tanf(float x); float sinf(float x); float cosf(float x); diff --git a/tools/project.py b/tools/project.py index 0cc9e4c0..0f5ad89b 100644 --- a/tools/project.py +++ b/tools/project.py @@ -886,7 +886,9 @@ def generate_objdiff_config(config, build_config): return lib, obj = result - unit_src_path = config.src_dir / obj.options["source"] + src_dir = Path(lib.get("src_dir", config.src_dir)) + + unit_src_path = src_dir / obj.options["source"] if not unit_src_path.exists(): objdiff_config["units"].append(unit_config) return