shithub: rgbds

Info  •  Files  •  Log  •  Branches

Merge https://github.com/bentley/rgbds

--- a/Makefile

+++ b/Makefile

@@ -58,7 +58,12 @@

 	${Q}install -s -m 555 rgbfix ${BINPREFIX}/rgbfix

 	${Q}install -s -m 555 rgblink ${BINPREFIX}/rgblink

 	${Q}install -s -m 555 rgblib ${BINPREFIX}/rgblib

-	${Q}install -m 444 src/rgbds.7 ${MANPREFIX}/man7/rgbds.7

+	${Q}install -m 444 src/rgbds.7 ${MANPREFIX}/man7/rgbds.7 || \

+		(echo Installing manpages to ${MANPREFIX} failed. >&2 && \

+		 echo Check where your manpages are installed and set the \

+		      proper directory >&2 && \

+		 echo with, e.g., make install MANPREFIX=/usr/share/man \

+		 >&2 ; false)

 	${Q}install -m 444 src/asm/rgbasm.1 \

 		${MANPREFIX}/man1/rgbasm.1

 	${Q}install -m 444 src/fix/rgbfix.1 \

--- a/src/asm/symbol.c

+++ b/src/asm/symbol.c

@@ -365,12 +365,12 @@

 			}

 			return (getvaluefield(psym));

 		} else {

-			if ((nPass == 1) || (psym->nType & SYMF_IMPORT)) {

-				/* 0x80 seems like a good default value... */

-				return (0x80);

-			} else {

-				yyerror("'%s' not defined", s);

+			if (nPass == 2) {

+				/* Assume undefined symbols are imported from somewhere else */

+				psym->nType |= SYMF_IMPORT;

 			}

+			/* 0x80 seems like a good default value... */

+			return (0x80);

 		}

 	} else {

 		if (nPass == 1) {