Skip to content

Commit

Permalink
black
Browse files Browse the repository at this point in the history
  • Loading branch information
bates64 committed Feb 1, 2024
1 parent 295f704 commit cecaf2d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tools/build/append_symbol_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def add_string(s: str):
if file_basename == "":
f.write(struct.pack(">I", 0))
else:
f.write(struct.pack(">I", add_string(f"{file_basename}:{line_number}"))) # can make more efficient
f.write(struct.pack(">I", add_string(f"{file_basename}:{line_number}"))) # can make more efficient

f.write(strings)

Expand Down
3 changes: 1 addition & 2 deletions tools/build/configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def write_ninja_rules(
ninja.variable("python", sys.executable)

ld_args = f"-T ver/$version/build/undefined_syms.txt -T ver/$version/undefined_syms_auto.txt -T ver/$version/undefined_funcs_auto.txt -Map $mapfile --no-check-sections -T $in -o $out"
ld = f"{cross}ld" if not 'PAPERMARIO_LD' in os.environ else os.environ['PAPERMARIO_LD']
ld = f"{cross}ld" if not "PAPERMARIO_LD" in os.environ else os.environ["PAPERMARIO_LD"]

if shift:
# For the shiftable build, we link twice to resolve some addresses that gnu ld can't figure out all in one go.
Expand Down Expand Up @@ -754,7 +754,6 @@ def build(
"cppflags": cppflags,
"iconv": iconv,
},

)

# images embedded inside data aren't linked, but they do need to be built into .bin files
Expand Down
1 change: 1 addition & 0 deletions tools/splat_ext/a.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from splat.segtypes.linker_entry import LinkerEntry
from splat.util import options


class N64SegA(N64Segment):
def get_linker_entries(self):
path = options.opts.asset_path / self.dir / (self.name + ".a")
Expand Down

0 comments on commit cecaf2d

Please sign in to comment.