commit 2017a8de7c4dbf24c4fe4dfc90ff23fef3b5458e
parent 1bba517f3716e166a0d52224f43c100b44b12289
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Thu, 22 Feb 2024 14:16:28 -0800
Added potato to boot
Diffstat:
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/boot.rom b/boot.rom
Binary files differ.
diff --git a/build.sh b/build.sh
@@ -89,25 +89,15 @@ then
cp bin/uxnemu bin/uxnasm bin/uxncli $HOME/bin/
fi
-bin/uxnasm projects/software/launcher.tal bin/launcher.rom
-bin/uxnasm projects/software/asma.tal bin/asma.rom
-
if [ $norun = 1 ]; then exit; fi
-# Test usage
-
-bin/uxnasm
-bin/uxncli
-bin/uxnemu
-
# Test version
bin/uxnasm -v
bin/uxncli -v
bin/uxnemu -v
-bin/uxnasm projects/examples/devices/mouse.tal bin/mouse.rom
-bin/uxnemu -2x bin/mouse.rom
+bin/uxnemu -2x
# bin/uxnasm test.tal bin/test.rom
# bin/uxncli bin/test.rom
diff --git a/src/uxnemu.c b/src/uxnemu.c
@@ -499,7 +499,7 @@ main(int argc, char **argv)
/* flags */
if(argc > 1 && argv[i][0] == '-') {
if(!strcmp(argv[i], "-v"))
- return system_error("Uxnemu - Varvara Emulator(GUI)", "18 Feb 2024.");
+ return system_error("Uxnemu - Varvara Emulator(GUI)", "22 Feb 2024.");
else if(!strcmp(argv[i], "-2x"))
set_zoom(2, 0);
else if(!strcmp(argv[i], "-3x"))
@@ -508,13 +508,11 @@ main(int argc, char **argv)
set_fullscreen(1, 0);
i++;
}
- if(i == argc)
- return system_error("usage:", "uxnemu [-v | -f | -2x | -3x] file.rom [args...]");
/* start */
+ rom = i == argc ? "boot.rom" : argv[i++];
ram = (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8));
- rom = argv[i++];
if(!system_init(&u, ram, rom) || !system_init(&u_audio, ram, rom))
- return system_error("Init", "Failed to initialize uxn.");
+ return system_error("usage:", "uxnemu [-v | -f | -2x | -3x] file.rom [args...]");
if(!emu_init(&u_audio))
return system_error("Init", "Failed to initialize varvara.");
/* loop */