mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-21 13:36:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize library code into libs/ (#3119)

Browse Source 
* Reorganize files into libs/{dolphin,JSystem,PowerPC_EABI_Support,revolution,TRK_MINNOW_DOLPHIN}

* Update configure.py and project.py for new libs structure

* Refactor `#include <dolphin/x.h>` -> `<x.h>`

* Remove `__REVOLUTION_SDK__` forwards from dolphin

* Fix dolphin/ references in revolution

* Wrap `#include <dolphin.h>` in `!__REVOLUTION_SDK__`

* Always build TRK against dolphin headers

* Resolve revolution SDK header resolution issues
This commit is contained in:
Luke Street
2026-03-01 15:35:36 -07:00
committed by GitHub
parent c9a46bd65b
commit 4df8ccc871
1740 changed files with 583 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/project.py
+15 -14
View File
@@ -68,6 +68,7 @@ class Object:
"shift_jis": None,
"source": name,
"src_dir": None,
"strip_prefix": None,
}
self.options.update(options)
@@ -115,10 +116,13 @@ class Object:
# Resolve paths
build_dir = config.out_path()
obj.src_path = Path(obj.options["src_dir"]) / obj.options["source"]
source = obj.options["source"]
if obj.options["strip_prefix"]:
source = source.removeprefix(obj.options["strip_prefix"])
obj.src_path = Path(obj.options["src_dir"]) / source
if obj.options["asm_dir"] is not None:
obj.asm_path = (
Path(obj.options["asm_dir"]) / obj.options["source"]
Path(obj.options["asm_dir"]) / source
).with_suffix(".s")
base_name = Path(self.name).with_suffix("")
obj.src_obj_path = build_dir / "src" / f"{base_name}.o"
@@ -356,14 +360,13 @@ def make_flags_str(flags: Optional[List[str]]) -> str:
return " ".join(flags)
def get_pch_out_name(config: ProjectConfig, pch: PrecompiledHeader) -> str:
pch_rel_path = Path(pch["source"])
pch_out_name = pch_rel_path.with_suffix(".mch")
def get_pch_out_path(config: ProjectConfig, pch: PrecompiledHeader) -> str:
pch_rel_path = Path(pch["output"])
# Use absolute path as a workaround to allow this target to be matched with absolute paths in depfiles.
#
# Without this any object which includes the PCH would depend on the .mch filesystem entry but not the
# corresponding Ninja task, so the MCH would not be implicitly rebuilt when the PCH is modified.
return os.path.abspath(config.out_path() / "include" / pch_out_name)
return os.path.abspath(config.out_path() / "include" / pch_rel_path)
# Unit configuration
@@ -863,7 +866,7 @@ def generate_build_ninja(
# Add all build steps needed before we compile (e.g. processing assets)
pch_out_names = [
get_pch_out_name(config, pch) for pch in config.precompiled_headers or []
get_pch_out_path(config, pch) for pch in config.precompiled_headers or []
]
write_custom_step("pre-compile", extra_inputs=pch_out_names)
@@ -967,14 +970,12 @@ def generate_build_ninja(
if config.precompiled_headers:
for pch in config.precompiled_headers:
src_path_rel_str = Path(pch["source"])
src_path_rel = Path(src_path_rel_str)
pch_out_name = src_path_rel.with_suffix(".mch")
pch_out_abs_path = Path(get_pch_out_name(config, pch))
src_path = Path(pch["source"])
pch_out_abs_path = Path(get_pch_out_path(config, pch))
# Add appropriate language flag if it doesn't exist already
cflags = pch["cflags"]
if not any(flag.startswith("-lang") for flag in cflags):
if file_is_cpp(src_path_rel):
if file_is_cpp(src_path):
cflags.insert(0, "-lang=c++")
else:
cflags.insert(0, "-lang=c")
@@ -982,11 +983,11 @@ def generate_build_ninja(
cflags_str = make_flags_str(cflags)
shift_jis = pch.get("shift_jis", config.shift_jis)
n.comment(f"Precompiled header {pch_out_name}")
n.comment(f"Precompiled header {pch['output']}")
n.build(
outputs=pch_out_abs_path,
rule="mwcc_pch_sjis" if shift_jis else "mwcc_pch",
inputs=f"include/{src_path_rel_str}",
inputs=src_path,
variables={
"mw_version": Path(pch["mw_version"]),
"cflags": cflags_str,