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

Switch to GNU Bison as a dependency

Browse Source 
First step for #595
This commit is contained in:
ISSOtm
2020-12-09 17:50:49 +01:00
parent ede982b50a
commit 3fe2fa43bb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/install_deps.sh vendored
View File

@@ -11,4 +11,4 @@ case `echo $1 | cut -d '-' -f 1` in
;; ;;
esac esac
yacc --version bison --version

2
Dockerfile
View File

@@ -7,7 +7,7 @@
FROM alpine:latest FROM alpine:latest
RUN apk add --update \ RUN apk add --update \
build-base \ build-base \
byacc \ bison \
libpng-dev libpng-dev
COPY . /rgbds COPY . /rgbds
WORKDIR /rgbds WORKDIR /rgbds

12
Makefile
View File

@@ -45,7 +45,7 @@ REALLDFLAGS := ${LDFLAGS} ${WARNFLAGS} \
YFLAGS ?= YFLAGS ?=
YACC := yacc BISON := bison
RM := rm -rf RM := rm -rf
# Rules to build the RGBDS binaries # Rules to build the RGBDS binaries
@@ -114,15 +114,15 @@ rgbgfx: ${rgbgfx_obj}
# Rules to process files # Rules to process files
# We want the yacc invocations to pass through our rules, not default ones # We want the Bison invocations to pass through our rules, not default ones
.y.o: .y.o:
# yacc-generated C files have an accompanying header # bison-generated C files have an accompanying header
.c.h: .c.h:
$Qtouch $@ $Qtouch $@
.y.c: .y.c:
$Q${YACC} -d ${YFLAGS} -o $@ $< $Q${BISON} -d ${YFLAGS} -o $@ $<
.c.o: .c.o:
$Q${CC} ${REALCFLAGS} ${PNGCFLAGS} -c -o $@ $< $Q${CC} ${REALCFLAGS} ${PNGCFLAGS} -c -o $@ $<
@@ -206,11 +206,11 @@ develop:
# install instructions instead. # install instructions instead.
mingw32: mingw32:
$Qmake CC=i686-w64-mingw32-gcc YACC=bison \ $Qmake CC=i686-w64-mingw32-gcc BISON=bison \
PKG_CONFIG=i686-w64-mingw32-pkg-config -j PKG_CONFIG=i686-w64-mingw32-pkg-config -j
mingw64: mingw64:
$Qmake CC=x86_64-w64-mingw32-gcc YACC=bison \ $Qmake CC=x86_64-w64-mingw32-gcc BISON=bison \
PKG_CONFIG=x86_64-w64-mingw32-pkg-config -j PKG_CONFIG=x86_64-w64-mingw32-pkg-config -j
wine-shim: wine-shim: