commit ecfecbb
Devine Lu Linvega
·
2024-11-13 01:45:25 +0000 UTC
parent d052822
Fixed issue with usage
3 files changed,
+22,
-18
M
makefile
+6,
-3
1@@ -16,9 +16,12 @@ run: all bin/uxnasm bin/uxncli bin/uxn11
2 debug: bin/uxnasm-debug bin/uxncli-debug bin/uxn11-debug
3 @ bin/uxncli-debug bin/opctest.rom
4 test: all
5- @ bin/uxncli && bin/uxncli -v
6- @ bin/uxn11 -v
7- @ bin/uxnasm -v
8+ bin/uxncli
9+ bin/uxncli -v
10+ bin/uxn11
11+ bin/uxn11 -v
12+ bin/uxnasm
13+ bin/uxnasm -v
14 @ bin/uxnasm etc/opctest.tal bin/opctest.rom
15 @ bin/uxncli bin/opctest.rom
16 install: all
+7,
-7
1@@ -259,14 +259,14 @@ int
2 main(int argc, char **argv)
3 {
4 int i = 1;
5- if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'v')
6- fprintf(stdout, "Uxn11 - Varvara Emulator, 12 Nov 2024.\n"), i++;
7- else if(!display_init())
8- return !fprintf(stdout, "Could not init: display\n");
9- else if(argc > 1 && !system_boot(ram, argv[i++]))
10- return !fprintf(stdout, "Could not load rom: %s\n", argv[i-1]);
11- else if(!system_boot(ram, "boot.rom"))
12+ if(argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v')
13+ return !fprintf(stdout, "Uxn11 - Varvara Emulator, 12 Nov 2024.\n");
14+ else if(argc == 1)
15 return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
16+ else if(!display_init())
17+ return !fprintf(stdout, "Could not open display.\n");
18+ else if(!system_boot(ram, argv[i++]))
19+ return !fprintf(stdout, "Could not load %s.\n", argv[i - 1]);
20 uxn.dev[0x17] = argc - i;
21 if(uxn_eval(&uxn, PAGE_PROGRAM))
22 console_listen(i, argc, argv), emu_run();
+9,
-8
1@@ -60,14 +60,15 @@ emu_run(void)
2 int
3 main(int argc, char **argv)
4 {
5- if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'v')
6- fprintf(stdout, "Uxn11(cli) - Varvara Emulator, 12 Nov 2024.\n");
7- else if(argc == 1 || !system_boot(ram, argv[1]))
8+ int i = 1;
9+ if(argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v')
10+ return !fprintf(stdout, "Uxn11(cli) - Varvara Emulator, 12 Nov 2024.\n");
11+ else if(argc == 1)
12 return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
13- else {
14- uxn.dev[0x17] = argc - 2;
15- if(uxn_eval(&uxn, PAGE_PROGRAM) && uxn.dev[0x10])
16- console_listen(2, argc, argv), emu_run();
17- }
18+ else if(!system_boot(ram, argv[i++]))
19+ return !fprintf(stdout, "Could not load %s.\n", argv[i - 1]);
20+ uxn.dev[0x17] = argc - 2;
21+ if(uxn_eval(&uxn, PAGE_PROGRAM) && uxn.dev[0x10])
22+ console_listen(2, argc, argv), emu_run();
23 return uxn.dev[0x0f] & 0x7f;
24 }