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

Refactor how Makefile invokes Bison for reusability (#1259)

Browse Source 
Co-authored-by: Eldred Habert <eldredhabert0@gmail.com>
This commit is contained in:
Rangi
2023-12-01 13:29:05 -05:00
committed by GitHub
parent 6132b77c1e
commit 1402615bc0
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@@ -39,9 +39,9 @@ LDFLAGS ?=
REALLDFLAGS := ${LDFLAGS} ${WARNFLAGS} \
-DBUILD_VERSION_STRING=\"${VERSION_STRING}\"
YFLAGS ?= -Wall
# Wrapper around bison that passes flags depending on what the version supports
BISON := src/bison.sh
BISON := bison
RM := rm -rf
# Used for checking pull requests
@@ -138,19 +138,7 @@ src/asm/parser.hpp: src/asm/parser.cpp
$Qtouch $@
src/asm/parser.cpp: src/asm/parser.y
$QDEFS=; \
add_flag(){ \
if src/check_bison_ver.sh $$1 $$2; then \
DEFS="-D$$3 $$DEFS"; \
fi \
}; \
add_flag 3 5 api.token.raw=true; \
add_flag 3 6 parse.error=detailed; \
add_flag 3 0 parse.error=verbose; \
add_flag 3 0 parse.lac=full; \
add_flag 3 0 lr.type=ielr; \
echo "DEFS=$$DEFS"; \
${BISON} $$DEFS -d ${YFLAGS} -o $@ $<
$Q${BISON} $@ $<
# Only RGBGFX uses libpng (POSIX make doesn't support pattern rules to cover all these)
src/gfx/main.o: src/gfx/main.cpp
@@ -244,12 +232,12 @@ mingw32:
$Q${MAKE} all test/gfx/randtilegen test/gfx/rgbgfx_test \
CXX=i686-w64-mingw32-g++ \
CXXFLAGS="-O3 -flto -DNDEBUG -static-libgcc" \
BISON=bison PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/i686-w64-mingw32 pkg-config"
PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/i686-w64-mingw32 pkg-config"
mingw64:
$Q${MAKE} all test/gfx/randtilegen test/gfx/rgbgfx_test \
CXX=x86_64-w64-mingw32-g++ \
BISON=bison PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/x86_64-w64-mingw32 pkg-config"
PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=/usr/x86_64-w64-mingw32 pkg-config"
wine-shim:
$Qecho '#!/usr/bin/env bash' > rgbshim.sh

26
src/bison.sh Executable file
View File

@@ -0,0 +1,26 @@
#!/usr/bin/env bash
set -e
BISONFLAGS=-Wall
readonly BISON_VER=$(bison -V)
add_flag () {
if awk <<<"$BISON_VER" -v major="$1" -v minor="$2" '
/^bison.*[0-9]+(\.[0-9]+)(\.[0-9]+)?$/ {
match($0, /[0-9]+(\.[0-9]+)(\.[0-9]+)?$/);
split(substr($0, RSTART), ver, ".");
if (ver[1] == major && ver[2] >= minor) { exit 0 } else { exit 1 }
}'; then
BISONFLAGS="-D$3 $BISONFLAGS"
fi
}
add_flag 3 5 api.token.raw=true
add_flag 3 6 parse.error=detailed
add_flag 3 0 parse.error=verbose
add_flag 3 0 parse.lac=full
add_flag 3 0 lr.type=ielr
echo "BISONFLAGS=$BISONFLAGS"
exec bison $BISONFLAGS -d -o "$1" "$2"

8
src/check_bison_ver.sh
View File

@@ -1,8 +0,0 @@
#!/usr/bin/env bash
bison -V | awk -v major="$1" -v minor="$2" '
/^bison.*[0-9]+(\.[0-9]+)(\.[0-9]+)?$/ {
match($0, /[0-9]+(\.[0-9]+)(\.[0-9]+)?$/);
split(substr($0, RSTART), ver, ".");
if (ver[1] == major && ver[2] >= minor) { exit 0 } else { exit 1 }
}'

1
src/link/main.cpp
View File

@@ -504,7 +504,6 @@ int main(int argc, char *argv[])
reportErrors();
}
// then process them,
obj_DoSanityChecks();
if (nbErrors != 0)