From 2017a8de7c4dbf24c4fe4dfc90ff23fef3b5458e Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Thu, 22 Feb 2024 14:16:28 -0800 Subject: [PATCH] Added potato to boot --- boot.rom | Bin 0 -> 16126 bytes build.sh | 12 +----------- src/uxnemu.c | 8 +++----- 3 files changed, 4 insertions(+), 16 deletions(-) create mode 100644 boot.rom diff --git a/boot.rom b/boot.rom new file mode 100644 index 0000000000000000000000000000000000000000..c32bcfc1d16782ad5d401f7d82411af87baf23c3 GIT binary patch literal 16126 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 Y%iFbsGdx~@Ajp;!#AeRxxv22}07mU@k^lez literal 0 HcmV?d00001 diff --git a/build.sh b/build.sh index 0bcce11..587183c 100755 --- 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 index 75843fc..744ecd7 100644 --- 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 */