git.y1.nz

commit bede1840ac4fd3e6596350676e3d1fbaa69ae08f
parent a0132b91d1c30966efbbd78f3a24b61bbebe344a
Author: Toxa <56631470+untoxa@users.noreply.github.com>
Date:   Wed, 17 Feb 2021 12:09:56 +0300

Merge pull request #136 from basxto/4.0.2-patched

Allow to specify directory for executables
Diffstat:
M
Makefile
4
++++
M
gbdk-lib/include/gb/gb.h
2
+-
M
gbdk-support/lcc/Makefile
3
+++
M
gbdk-support/lcc/gb.c
4
++++

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -111,7 +111,11 @@ build-dir-clean:
 # Rules for gbdk-support
 gbdk-support-build:
 	@echo Building lcc
+ifdef BINDIR
+	@$(MAKE) -C $(GBDKSUPPORTDIR)/lcc TOOLSPREFIX=$(TOOLSPREFIX) TARGETDIR=$(TARGETDIR)/ BINDIR=$(BINDIR)/ --no-print-directory
+else
 	@$(MAKE) -C $(GBDKSUPPORTDIR)/lcc TOOLSPREFIX=$(TOOLSPREFIX) TARGETDIR=$(TARGETDIR)/ --no-print-directory
+endif
 	@echo
 	@echo Building ihxcheck
 	@$(MAKE) -C $(GBDKSUPPORTDIR)/ihxcheck TOOLSPREFIX=$(TOOLSPREFIX) TARGETDIR=$(TARGETDIR)/ --no-print-directory
diff --git a/gbdk-lib/include/gb/gb.h b/gbdk-lib/include/gb/gb.h
@@ -431,7 +431,7 @@ void delay(UINT16 d) NONBANKED;
 */
 UINT8 joypad(void) NONBANKED __preserves_regs(b, c, h, l);
 
-/** Waits until all the buttons given in mask are pressed.
+/** Waits until at least one of the buttons given in mask are pressed.
 
     @param mask Bitmask indicating which buttons to wait for
 
diff --git a/gbdk-support/lcc/Makefile b/gbdk-support/lcc/Makefile
@@ -10,6 +10,9 @@ BUILDTIME=$(shell date --utc +%H:%M:%S)
 CC = $(TOOLSPREFIX)gcc
 CFLAGS = -ggdb -O -Wno-incompatible-pointer-types -DGBDKLIBDIR=\"$(TARGETDIR)\"
 CFLAGS += -DBUILDDATE=\"$(BUILDDATE)\" -DBUILDTIME=\"$(BUILDTIME)\"
+ifdef BINDIR
+CFLAGS += -DGBDKBINDIR=\"$(BINDIR)\"
+endif
 OBJ = lcc.o gb.o
 BIN = lcc
 
diff --git a/gbdk-support/lcc/gb.c b/gbdk-support/lcc/gb.c
@@ -55,7 +55,11 @@ static struct {
 		{ "ld",		"%sdccdir%sdldgb" },
 		{ "libdir",		"%prefix%lib/%libmodel%/asxxxx/" },
 		{ "libmodel",	"small" },
+#ifndef GBDKBINDIR
 		{ "bindir",		"%prefix%bin/" },
+#else
+		{ "bindir",		GBDKBINDIR },
+#endif
 		{ "ihxcheck", "%bindir%ihxcheck" },
 		{ "mkbin", "%sdccdir%makebin" }
 };

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.