Merge branch 'main' of ssh://musuka.dev:2222/paoda/zba

lib/SDL.zig

@@ -1 +1 @@
-Subproject commit 021b71dde4774364b9da2418e3de2c42499c605d
+Subproject commit 47b8ab43f3cf8362b266613e55704c8ae38e9bc6

lib/zig-clap

@@ -1 +1 @@
-Subproject commit a2af4a9267c547ec0f91ea1a84b2a50760ca5483
+Subproject commit ac5f46541ca47d3db9df0fcef3cc61731adaefab

src/main.zig

@@ -32,26 +32,25 @@ pub fn main() anyerror!void {
     const alloc = gpa.allocator();
     defer std.debug.assert(!gpa.deinit());
 
-    // Parse CLI Arguments
+    // CLI Arguments
-    const params = comptime [_]clap.Param(clap.Help){
+    const params = comptime clap.parseParamsComptime(
-        clap.parseParam("-h, --help         Display this help and exit.     ") catch unreachable,
+        \\-h, --help            Display this help and exit.
-        clap.parseParam("-b, --bios <PATH>  Optional Path to GBA BIOS ROM.  ") catch unreachable,
+        \\-b, --bios <str>      Optional path to a GBA BIOS ROM.
-        clap.parseParam("<PATH>             Path to GBA GamePak ROM         ") catch unreachable,
+        \\<str>                 Path to the GBA GamePak ROM
-    };
+        \\
+    );
 
-    var args = try clap.parse(clap.Help, &params, .{});
+    var res = try clap.parse(clap.Help, &params, clap.parsers.default, .{});
-    defer args.deinit();
+    defer res.deinit();
 
-    if (args.flag("--help")) return clap.help(std.io.getStdErr().writer(), &params);
-
-    const bios_path: ?[]const u8 = if (args.option("--bios")) |p| p else null;
-
-    const positionals = args.positionals();
     const stderr = std.io.getStdErr();
     defer stderr.close();
 
-    const rom_path = switch (positionals.len) {
+    if (res.args.help) return clap.help(stderr.writer(), clap.Help, &params, .{});
-        1 => positionals[0],
+    const bios_path: ?[]const u8 = if (res.args.bios) |p| p else null;
+
+    const rom_path = switch (res.positionals.len) {
+        1 => res.positionals[0],
         0 => {
             try stderr.writeAll("ZBA requires a positional path to a GamePak ROM.\n");
             return CliError.InsufficientOptions;