commit 8e3676f
neauoire
·
2023-08-08 23:34:30 +0000 UTC
parent 1355d78
Added version to uxnasm
3 files changed,
+9,
-7
M
build.sh
+3,
-2
1@@ -36,8 +36,7 @@ fi
2
3 if [ "${1}" = '--install' ];
4 then
5- cp bin/uxn11 bin/uxn11
6- cp bin/uxnemu bin/uxnasm bin/uxncli $HOME/bin/
7+ cp bin/uxn11 bin/uxnasm bin/uxncli $HOME/bin/
8 fi
9
10 # bin/uxnasm etc/polycat.tal bin/polycat.rom
11@@ -48,11 +47,13 @@ if [ "${1}" = '--norun' ]; then exit; fi
12
13 # Test usage
14
15+./bin/uxnasm
16 ./bin/uxncli
17 ./bin/uxn11
18
19 # Test version
20
21+./bin/uxnasm -v
22 ./bin/uxncli -v
23 ./bin/uxn11 -v
24
+1,
-3
1@@ -207,7 +207,7 @@ main(int argc, char **argv)
2 struct pollfd fds[3];
3 static const struct itimerspec screen_tspec = {{0, 16666666}, {0, 16666666}};
4 if(i == argc)
5- return system_error("usage", "uxn11 [-v][-2x][-3x] file.rom [args...]");
6+ return system_error("usage", "uxn11 [-v] file.rom [args...]");
7 /* Connect Varvara */
8 system_connect(0x0, SYSTEM_VERSION, SYSTEM_DEIMASK, SYSTEM_DEOMASK);
9 system_connect(0x1, CONSOLE_VERSION, CONSOLE_DEIMASK, CONSOLE_DEOMASK);
10@@ -221,8 +221,6 @@ main(int argc, char **argv)
11 if(argv[i][0] == '-' && argv[i][1] == 'v')
12 return system_version("Uxn11 - Graphical Varvara Emulator", "8 Aug 2023");
13
14-
15-
16 rom_path = argv[1];
17 if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))
18 return system_error("boot", "Failed");
+5,
-2
1@@ -498,9 +498,12 @@ writesym(char *filename)
2 int
3 main(int argc, char *argv[])
4 {
5+ int i = 1;
6 FILE *src, *dst;
7- if(argc < 3)
8- return !error("usage", "uxnasm input.tal output.rom");
9+ if(i == argc)
10+ return error("usage", "uxnasm [-v] input.tal output.rom");
11+ if(argv[i][0] == '-' && argv[i][1] == 'v')
12+ return !fprintf(stdout, "Uxnasm - Uxntal Assembler, 8 Aug 2023\n");
13 if(!(src = fopen(argv[1], "r")))
14 return !error("Invalid input", argv[1]);
15 if(!assemble(src))