Skip to content

Commit

Permalink
Switch to GNU Bison as a dependency
Browse files Browse the repository at this point in the history
First step for #595
  • Loading branch information
ISSOtm committed Dec 9, 2020
1 parent 319d775 commit a5735c3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/actions/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ case `echo $1 | cut -d '-' -f 1` in
;;
esac

yacc --version
bison --version
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
FROM alpine:latest
RUN apk add --update \
build-base \
byacc \
bison \
libpng-dev
COPY . /rgbds
WORKDIR /rgbds
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ REALLDFLAGS := ${LDFLAGS} ${WARNFLAGS} \

YFLAGS ?=

YACC := yacc
BISON := bison
RM := rm -rf

# Rules to build the RGBDS binaries
Expand Down Expand Up @@ -114,15 +114,15 @@ rgbgfx: ${rgbgfx_obj}

# 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:

# yacc-generated C files have an accompanying header
# bison-generated C files have an accompanying header
.c.h:
$Qtouch $@

.y.c:
$Q${YACC} -d ${YFLAGS} -o $@ $<
$Q${BISON} -d ${YFLAGS} -o $@ $<

.c.o:
$Q${CC} ${REALCFLAGS} ${PNGCFLAGS} -c -o $@ $<
Expand Down Expand Up @@ -206,11 +206,11 @@ develop:
# install instructions instead.

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

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

wine-shim:
Expand Down

0 comments on commit a5735c3

Please sign in to comment.