Skip to content

Commit 1e785a4

Browse files
committed
Update RGBDS to v1.0.0
1 parent 3f935f4 commit 1e785a4

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

patches/rgbds.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ index c62a0e9d..39d357b2 100644
1212
OUTPUT_VARIABLE GIT_REV OUTPUT_STRIP_TRAILING_WHITESPACE
1313
ERROR_QUIET)
1414
diff --git a/Makefile b/Makefile
15-
index 6a0da441..792ac504 100644
15+
index a0e7a07c..8bf8921f 100644
1616
--- a/Makefile
1717
+++ b/Makefile
1818
@@ -24,7 +24,7 @@ PNGLDFLAGS := `${PKG_CONFIG} --libs-only-L libpng`
@@ -25,32 +25,32 @@ index 6a0da441..792ac504 100644
2525
WARNFLAGS := -Wall -pedantic -Wno-unknown-warning-option -Wno-gnu-zero-variadic-macro-arguments
2626

2727
diff --git a/src/asm/parser.y b/src/asm/parser.y
28-
index d22f1557..e9d9f94a 100644
28+
index 1e2c7780..3ad648a8 100644
2929
--- a/src/asm/parser.y
3030
+++ b/src/asm/parser.y
31-
@@ -62,6 +62,8 @@
31+
@@ -57,6 +57,8 @@
3232

3333
yy::parser::symbol_type yylex(); // Provided by lexer.cpp
3434

3535
+ Symbol *sym_AddSecret();
3636
+
37-
template <typename N, typename S>
38-
static auto handleSymbolByType(std::string const &symName, N numCallback, S strCallback) {
39-
if (Symbol *sym = sym_FindScopedSymbol(symName); sym && sym->type == SYM_EQUS) {
40-
@@ -514,7 +516,7 @@ else:
37+
template<typename NumCallbackFnT, typename StrCallbackFnT>
38+
static auto handleSymbolByType(
39+
std::string const &symName, NumCallbackFnT numCallback, StrCallbackFnT strCallback
40+
@@ -489,7 +491,7 @@ else:
4141

4242
plain_directive:
4343
label
44-
- | label cpu_commands
45-
+ | label { sym_AddSecret(); } cpu_commands
46-
| label macro
44+
- | label data
45+
+ | label { sym_AddSecret(); } data
46+
| label macro_invocation
4747
| label directive
4848
;
4949
diff --git a/src/asm/symbol.cpp b/src/asm/symbol.cpp
50-
index 59aaccae..b143b0fb 100644
50+
index 571dd2f3..e9dd14ff 100644
5151
--- a/src/asm/symbol.cpp
5252
+++ b/src/asm/symbol.cpp
53-
@@ -718,3 +718,33 @@ void sym_Init(time_t now) {
53+
@@ -776,3 +776,33 @@ void sym_Init(time_t now) {
5454
sym_AddEqu("__UTC_MINUTE__"s, time_utc->tm_min)->isBuiltin = true;
5555
sym_AddEqu("__UTC_SECOND__"s, time_utc->tm_sec)->isBuiltin = true;
5656
}

rgbds

Submodule rgbds updated 827 files

0 commit comments

Comments
 (0)