1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 02:54:24 +00:00

Merge remote-tracking branch 'upstream/main' into meta_new_assets_2025

This commit is contained in:
Dragorn421 2025-05-06 23:35:41 +02:00
commit 82a1961583
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335

View file

@ -483,7 +483,7 @@ def find_compiler_command_line(
found = 0 found = 0
for line in make_log: for line in make_log:
parts = line.split() parts = line.split()
if "-o" in parts and str(filename) in parts: if "./tools/preprocess.sh" in parts and "-o" in parts and str(filename) in parts:
compiler_command_line = parts compiler_command_line = parts
found += 1 found += 1
@ -551,7 +551,7 @@ def main():
command_line = find_compiler_command_line(make_log, args.filename) command_line = find_compiler_command_line(make_log, args.filename)
if command_line is None: if command_line is None:
print( print(
f"Error: could not determine compiler command line for {filename}", f"Error: could not determine compiler command line for {args.filename}",
file=sys.stderr, file=sys.stderr,
) )
sys.exit(1) sys.exit(1)