kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #184 from gamemasterplc/main

Browse source 
Match more of musyx
This commit is contained in:
gamemasterplc 2024-02-19 22:07:14 -06:00 • committed by GitHub
commit c574e929f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
configure.py
View file

@ -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"),
}

1
include/math.h
View file

@ -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);

4
tools/project.py
View file

@ -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