mirror of
https://github.com/pmret/papermario.git
synced 2024-11-23 21:59:46 +00:00
git subrepo pull tools/splat
subrepo: subdir: "tools/splat" merged: "42786d2a7" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "42786d2a7" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596"
This commit is contained in:
parent
4141881c33
commit
4201a08a28
@ -6,7 +6,7 @@
|
||||
[subrepo]
|
||||
remote = https://github.com/ethteck/splat.git
|
||||
branch = master
|
||||
commit = 687885c4d8bcb86d399dbb7dcd660ad8548acdf7
|
||||
parent = dc7285954620634e352b43bcae320ba1f8dd8de7
|
||||
commit = 42786d2a77813ab4aa9e34f010f0e783a4f336d9
|
||||
parent = 4141881c33fb386869a5cd512e9e19dc7f4cb683
|
||||
method = merge
|
||||
cmdver = 0.4.3
|
||||
|
@ -194,6 +194,8 @@ def get_extension_class(options, config_path, seg_type, platform):
|
||||
|
||||
return getattr(ext_mod, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}")
|
||||
|
||||
def get_platform(options):
|
||||
return options.get("platform", "n64")
|
||||
|
||||
def fmt_size(size):
|
||||
if size > 1000000:
|
||||
@ -204,7 +206,7 @@ def fmt_size(size):
|
||||
return str(size) + " B"
|
||||
|
||||
|
||||
def initialize_segments(options, config_path, config_segments, platform):
|
||||
def initialize_segments(options, config_path, config_segments):
|
||||
seen_segment_names = set()
|
||||
ret = []
|
||||
|
||||
@ -215,6 +217,8 @@ def initialize_segments(options, config_path, config_segments, platform):
|
||||
|
||||
seg_type = parse_segment_type(segment)
|
||||
|
||||
platform = get_platform(options)
|
||||
|
||||
segment_class = get_base_segment_class(seg_type, platform)
|
||||
if segment_class == None:
|
||||
# Look in extensions
|
||||
@ -254,7 +258,7 @@ def main(rom_path, config_path, repo_path, modes, verbose, ignore_cache=False):
|
||||
symbol_addrs_path = get_symbol_addrs_path(repo_path, options)
|
||||
undefined_syms_path = get_undefined_syms_path(repo_path, options)
|
||||
provided_symbols, c_func_labels_to_add, special_labels, ranges = gather_symbols(symbol_addrs_path, undefined_syms_path)
|
||||
platform = options.get("platform", "n64")
|
||||
platform = get_platform(options)
|
||||
|
||||
processed_segments = []
|
||||
ld_sections = []
|
||||
|
Loading…
Reference in New Issue
Block a user