From ae7c382179a4a628840b393df685c6d548d84bb4 Mon Sep 17 00:00:00 2001 From: Charlotte Koch Date: Tue, 18 Jul 2023 00:20:57 -0700 Subject: [PATCH] Remove '-geos' command line option No longer needed since GEOS was removed from the X16 ROM --- Makefile | 1 - src/main.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/Makefile b/Makefile index 0e40d3d2..a71996dd 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,6 @@ define add_extra_files_to_package cp ../x16-rom/build/x16/kernal.sym $(TMPDIR_NAME) cp ../x16-rom/build/x16/keymap.sym $(TMPDIR_NAME) cp ../x16-rom/build/x16/dos.sym $(TMPDIR_NAME) - cp ../x16-rom/build/x16/geos.sym $(TMPDIR_NAME) cp ../x16-rom/build/x16/basic.sym $(TMPDIR_NAME) cp ../x16-rom/build/x16/monitor.sym $(TMPDIR_NAME) cp ../x16-rom/build/x16/charset.sym $(TMPDIR_NAME) diff --git a/src/main.c b/src/main.c index 196e5bb2..db67a384 100644 --- a/src/main.c +++ b/src/main.c @@ -465,8 +465,6 @@ usage() printf("\tkeyboard.\n"); printf("-run\n"); printf("\tStart the -prg/-bas program using RUN\n"); - printf("-geos\n"); - printf("\tLaunch GEOS at startup.\n"); printf("-warp\n"); printf("\tEnable warp mode, run emulator as fast as possible.\n"); printf("-echo [{iso|raw}]\n"); @@ -573,7 +571,6 @@ main(int argc, char **argv) char *prg_path = NULL; char *bas_path = NULL; char *sdcard_path = NULL; - bool run_geos = false; bool run_test = false; int test_number = 0; int audio_buffers = 8; @@ -658,10 +655,6 @@ main(int argc, char **argv) bas_path = argv[0]; argc--; argv++; - } else if (!strcmp(argv[0], "-geos")) { - argc--; - argv++; - run_geos = true; } else if (!strcmp(argv[0], "-test")) { argc--; argv++; @@ -1076,9 +1069,6 @@ main(int argc, char **argv) SDL_RWclose(bas_file); } - if (run_geos) { - paste_text = "GEOS\r"; - } if (run_test) { paste_text = paste_text_data; snprintf(paste_text, sizeof(paste_text_data), "TEST %d\r", test_number);