PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.py: Use options hash for objects 

Former-commit-id: 72c5c362fc
This commit is contained in:
Luke Street 2023-01-31 00:57:45 -05:00
parent 234f474679
commit cc7e174eeb
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
configure.py
View File

@ -809,7 +809,7 @@ LIBS = [
["Dolphin/os/OSArena", True], ["Dolphin/os/OSArena", True],
["Dolphin/os/OSAudioSystem", True], ["Dolphin/os/OSAudioSystem", True],
["Dolphin/os/OSCache", True], ["Dolphin/os/OSCache", True],
["Dolphin/os/OSContext", True, True, True], ["Dolphin/os/OSContext", True, {"mw_version": "1.2.5"}],
["Dolphin/os/OSError", True], ["Dolphin/os/OSError", True],
"Dolphin/os/OSFatal", "Dolphin/os/OSFatal",
"Dolphin/os/OSFont", "Dolphin/os/OSFont",
@ -926,7 +926,7 @@ LIBS = [
"musyx/seq", "musyx/seq",
"musyx/synth", "musyx/synth",
["musyx/seq_api", True], ["musyx/seq_api", True],
["musyx/snd_synthapi", True, False], ["musyx/snd_synthapi", True, {"add_to_all": False}],
["musyx/stream", False], ["musyx/stream", False],
"musyx/synthdata", "musyx/synthdata",
"musyx/synthmacros", "musyx/synthmacros",
@ -1376,17 +1376,19 @@ if __name__ == "__main__":
for object in lib["objects"]: for object in lib["objects"]:
completed = None completed = None
add_to_all = True options = {
no_frank = False "add_to_all": True,
"mw_version": None,
"cflags": None,
}
if type(object) is list: if type(object) is list:
if len(object) > 1:
completed = object[1]
if len(object) > 2: if len(object) > 2:
add_to_all = object[2] options.update(object[2])
if len(object) > 3:
no_frank = object[3]
completed = object[1]
object = object[0] object = object[0]
mw_version = lib["mw_version"] mw_version = options["mw_version"] or lib["mw_version"]
c_file = None c_file = None
if os.path.exists(src_path / f"{object}.cpp"): if os.path.exists(src_path / f"{object}.cpp"):
c_file = src_path / f"{object}.cpp" c_file = src_path / f"{object}.cpp"
@ -1399,19 +1401,18 @@ if __name__ == "__main__":
implicit = [] implicit = []
if mw_version == "1.2.5e": if mw_version == "1.2.5e":
mw_version = "1.2.5" mw_version = "1.2.5"
if no_frank is False: rule = "mwcc_frank"
rule = "mwcc_frank" if args.frank:
if args.frank: implicit.append(frank)
implicit.append(frank) else:
else: implicit.append(franklite)
implicit.append(franklite)
n.build( n.build(
outputs=path(build_src_path / f"{object}.o"), outputs=path(build_src_path / f"{object}.o"),
rule=rule, rule=rule,
inputs=path(c_file), inputs=path(c_file),
variables={ variables={
"mw_version": mw_version, "mw_version": mw_version,
"cflags": lib["cflags"], "cflags": options["cflags"] or lib["cflags"],
"basedir": os.path.dirname(build_src_path / f"{object}"), "basedir": os.path.dirname(build_src_path / f"{object}"),
"basefile": path(build_src_path / f"{object}"), "basefile": path(build_src_path / f"{object}"),
}, },
@ -1427,9 +1428,9 @@ if __name__ == "__main__":
"basefile": path(build_host_path / object), "basefile": path(build_host_path / object),
}, },
) )
if add_to_all: if options["add_to_all"]:
host_source_inputs.append(build_host_path / f"{object}.o") host_source_inputs.append(build_host_path / f"{object}.o")
if add_to_all: if options["add_to_all"]:
source_inputs.append(build_src_path / f"{object}.o") source_inputs.append(build_src_path / f"{object}.o")
if os.path.exists(asm_path / f"{object}.s"): if os.path.exists(asm_path / f"{object}.s"):
n.build( n.build(