Turn on the -r argument in the default execution rule in the makefile. Some minor cleanup.

This commit is contained in:
Jeremy Rand 2021-05-05 23:33:59 -04:00
parent e7cef1bfca
commit 76d20f76e6
3 changed files with 3 additions and 7 deletions

View File

@ -23,10 +23,6 @@
// Defines // Defines
// This enables a workaround for creating the resources by writing a .rez file rather than
// writing it directly. At the moment, Golden Gate does not support writing resources
// but this will let me test it without that capability.
#define TEACH_FILE_TYPE 0x50 #define TEACH_FILE_TYPE 0x50
#define TEACH_AUX_TYPE 0x5445 #define TEACH_AUX_TYPE 0x5445
@ -36,7 +32,6 @@
#define STYLE_BLOCK_NUM 1 #define STYLE_BLOCK_NUM 1
// Typedefs // Typedefs
typedef struct tWindowPos typedef struct tWindowPos

View File

@ -43,7 +43,7 @@ int generateRez = 0;
static void printUsage(void) static void printUsage(void)
{ {
fprintf(stderr, "USAGE: %s [ -d -r ] inputfile outputfile\n", commandName); fprintf(stderr, "USAGE: %s [ -d ] [ -r ] inputfile outputfile\n", commandName);
} }
@ -65,6 +65,7 @@ static int parseArgs(int argc, char * argv[])
case 'd': case 'd':
debugEnabled = 1; debugEnabled = 1;
break; break;
case 'r': case 'r':
generateRez = 1; generateRez = 1;
break; break;

View File

@ -191,7 +191,7 @@ executeGUI: all
make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)" make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)"
executeShell: all executeShell: all
$(ORCA) --mem $(TARGETDIR)/$(PGM) -d test.md $(TARGETDIR)/outfile.txt $(ORCA) --mem $(TARGETDIR)/$(PGM) -d -r test.md $(TARGETDIR)/outfile.txt
make/teachRez $(TARGETDIR)/outfile.txt make/teachRez $(TARGETDIR)/outfile.txt
make/createDiskImage "$(DISKIMAGE)" $(DESTBOOTIMAGE) "$(TARGETDIR)/$(PGM)" "$(TARGETDIR)/outfile.txt" test.md make/createDiskImage "$(DISKIMAGE)" $(DESTBOOTIMAGE) "$(TARGETDIR)/$(PGM)" "$(TARGETDIR)/outfile.txt" test.md
make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)" make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)"