gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
stag019
2014-01-29 00:18:10 -05:00
parent 34656f9e5d af5f889326
commit 240d2a7f14
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -58,7 +58,12 @@ install: all
${Q}install -s -m 555 rgbfix ${BINPREFIX}/rgbfix ${Q}install -s -m 555 rgbfix ${BINPREFIX}/rgbfix
${Q}install -s -m 555 rgblink ${BINPREFIX}/rgblink ${Q}install -s -m 555 rgblink ${BINPREFIX}/rgblink
${Q}install -s -m 555 rgblib ${BINPREFIX}/rgblib ${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 \ ${Q}install -m 444 src/asm/rgbasm.1 \
${MANPREFIX}/man1/rgbasm.1 ${MANPREFIX}/man1/rgbasm.1
${Q}install -m 444 src/fix/rgbfix.1 \ ${Q}install -m 444 src/fix/rgbfix.1 \

10
src/asm/symbol.c
View File

@@ -365,12 +365,12 @@ sym_GetValue(char *s)
} }
return (getvaluefield(psym)); return (getvaluefield(psym));
} else { } else {
if ((nPass == 1) || (psym->nType & SYMF_IMPORT)) { if (nPass == 2) {
/* 0x80 seems like a good default value... */ /* Assume undefined symbols are imported from somewhere else */
return (0x80); psym->nType |= SYMF_IMPORT;
} else {
yyerror("'%s' not defined", s);
} }
/* 0x80 seems like a good default value... */
return (0x80);
} }
} else { } else {
if (nPass == 1) { if (nPass == 1) {