From 4eb935eb5a602f59d7ac646fa8757aeda81f4656 Mon Sep 17 00:00:00 2001 From: Melody Date: Tue, 25 Dec 2018 14:48:44 -0500 Subject: [PATCH 1/4] allow setting RGBASM in environment vars --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c78a996ce..73f5d1574 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ else SHA1 := sha1sum endif -RGBASM := rgbasm -RGBFIX := rgbfix -RGBGFX := rgbgfx -RGBLINK := rgblink +RGBASM ?= rgbasm +RGBFIX ?= rgbfix +RGBGFX ?= rgbgfx +RGBLINK ?= rgblink roms := pokecrystal.gbc pokecrystal11.gbc From 7e4b9569786b298becfe658c7a8417300dbf1382 Mon Sep 17 00:00:00 2001 From: Melody Date: Tue, 25 Dec 2018 15:13:57 -0500 Subject: [PATCH 2/4] allow setting RGBDS_DIR --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 73f5d1574..66fbca11b 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,11 @@ else SHA1 := sha1sum endif -RGBASM ?= rgbasm -RGBFIX ?= rgbfix -RGBGFX ?= rgbgfx -RGBLINK ?= rgblink +RGBDS_DIR ?= +RGBASM ?= $(RGBDS_DIR)rgbasm +RGBFIX ?= $(RGBDS_DIR)rgbfix +RGBGFX ?= $(RGBDS_DIR)rgbgfx +RGBLINK ?= $(RGBDS_DIR)rgblink roms := pokecrystal.gbc pokecrystal11.gbc From 2471f1ea714ef4852a7b2cfeb2662c03ffb8c082 Mon Sep 17 00:00:00 2001 From: Melody Date: Tue, 25 Dec 2018 15:45:03 -0500 Subject: [PATCH 3/4] rename RGBDS_DIR to RGBDS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 66fbca11b..eaa8e50c3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ else SHA1 := sha1sum endif -RGBDS_DIR ?= +RGBDS ?= RGBASM ?= $(RGBDS_DIR)rgbasm RGBFIX ?= $(RGBDS_DIR)rgbfix RGBGFX ?= $(RGBDS_DIR)rgbgfx From 97e04cfa33588f7737791954e08d97501e80a22b Mon Sep 17 00:00:00 2001 From: Melody Date: Tue, 25 Dec 2018 15:52:36 -0500 Subject: [PATCH 4/4] finish renaming RGBDS_DIR to RGBDS --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index eaa8e50c3..08834e479 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ SHA1 := sha1sum endif RGBDS ?= -RGBASM ?= $(RGBDS_DIR)rgbasm -RGBFIX ?= $(RGBDS_DIR)rgbfix -RGBGFX ?= $(RGBDS_DIR)rgbgfx -RGBLINK ?= $(RGBDS_DIR)rgblink +RGBASM ?= $(RGBDS)rgbasm +RGBFIX ?= $(RGBDS)rgbfix +RGBGFX ?= $(RGBDS)rgbgfx +RGBLINK ?= $(RGBDS)rgblink roms := pokecrystal.gbc pokecrystal11.gbc