From 111c2e84ae7a6a769042798b67bd5154759f90bc Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 24 Jan 2024 19:34:34 +0100 Subject: [PATCH 1/3] Fix mkdmadaata usage (#1617) --- tools/mkdmadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mkdmadata.c b/tools/mkdmadata.c index acdfb5ec30..c83864b559 100644 --- a/tools/mkdmadata.c +++ b/tools/mkdmadata.c @@ -54,7 +54,7 @@ static void usage(const char *execname) fprintf(stderr, "zelda64 dmadata generation tool v0.01\n" "usage: %s SPEC_FILE DMADATA_TABLE COMPRESS_RANGES\n" "SPEC_FILE file describing the organization of object files into segments\n" - "DMADATA_TABLE filename of output dmadata table header\n", + "DMADATA_TABLE filename of output dmadata table header\n" "COMPRESS_RANGES filename to write which files are compressed (e.g. 0-5,7,10-20)\n", execname); } From 0417e739cc0732464692af56f93eaf22eb47f88f Mon Sep 17 00:00:00 2001 From: cadmic Date: Wed, 24 Jan 2024 12:06:07 -0800 Subject: [PATCH 2/3] Suggest pip install -U -r requirements.txt (#1618) * Suggest pip install -r requirements.txt * Update README.md Co-authored-by: Dragorn421 --------- Co-authored-by: Dragorn421 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2dd814db6b..30adba5afa 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ Keep in mind that for each new terminal session, you will need to **activate** t Now you can install the Python dependencies, to do so run: ```bash -python3 -m pip install -U -r requirements.txt +pip install -U -r requirements.txt ``` #### 4. Prepare a base ROM From 16f9ff39beb1d9557dee6a1de19468d60ef23c09 Mon Sep 17 00:00:00 2001 From: cadmic Date: Wed, 24 Jan 2024 15:02:53 -0800 Subject: [PATCH 3/3] Rename `make compressed` to `make compress` (#1620) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3aae4a0c76..6fbac669a6 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,7 @@ ifneq ($(COMPARE),0) @md5sum -c baseroms/$(VERSION)/checksum.md5 endif -compressed: $(ROMC) +compress: $(ROMC) ifneq ($(COMPARE),0) @md5sum $(ROMC) @md5sum -c baseroms/$(VERSION)/checksum-compressed.md5 @@ -300,9 +300,9 @@ endif $(N64_EMULATOR) $< -.PHONY: all rom compressed clean setup run distclean assetclean +.PHONY: all rom compress clean setup run distclean assetclean .DEFAULT_GOAL := rom -all: rom compressed +all: rom compress #### Various Recipes ####