Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CLI options #66

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Fix CLI options #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7259f98
[cocas] Allow setting output file with --merge option
cjvth Mar 16, 2024
171e5f3
[cocas] Cast args.debug to bool where function requires bool
cjvth Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cocas/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ def main():

try:
if args.merge:
write_object_file('merged.obj', [tup[1] for tup in objects], target, (args.debug or args.merge))
write_object_file((args.output or 'merged.obj'), [tup[1] for tup in objects],
target, bool(args.debug or args.merge))
elif args.compile and args.output:
write_object_file(args.output, [tup[1] for tup in objects], target, args.debug)
write_object_file(args.output, [tup[1] for tup in objects], target, bool(args.debug))
elif args.compile:
for path, obj in objects:
write_object_file(path.with_suffix('.obj').name, [obj], target, args.debug)
write_object_file(path.with_suffix('.obj').name, [obj], target, bool(args.debug))
else:
# data, code_locations = link(objects)
data, code_locations = target_link(objects, target)
if args.output:
write_image(args.output, data)
Expand Down
Loading