From 3ad470411353d4e959e29a39c2ec22f7b6037528 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Mon, 17 Feb 2020 18:28:48 +0100 Subject: [PATCH 1/3] Put GCC specific option in separate Makefile variable. --- emu/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emu/Makefile b/emu/Makefile index 19abbb2..37b9d06 100644 --- a/emu/Makefile +++ b/emu/Makefile @@ -3,7 +3,8 @@ H=pdp6.h ../tools/pdp6common.h threading.h # clang #CFLAGS= -Wno-shift-op-parentheses -Wno-logical-op-parentheses \ # -Wno-bitwise-op-parentheses -CFLAGS= -g -O3 -Wall -Wno-parentheses -fno-diagnostics-show-caret +#GCCFLAGS=-fno-diagnostics-show-caret +CFLAGS= -g -O3 -Wall -Wno-parentheses $(GCCFLAGS) #CFLAGS= -g -Wall -Wno-parentheses -fno-diagnostics-show-caret SDLFLAGS=`sdl2-config --cflags` `pkg-config SDL2_image --cflags` -DGRAPHICS From ef8e363a215a279d64c93a094a6338b8e79d14a9 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Mon, 17 Feb 2020 18:32:47 +0100 Subject: [PATCH 2/3] Remove unused label. --- emu/netcons.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/emu/netcons.c b/emu/netcons.c index 9664d5a..da998fe 100644 --- a/emu/netcons.c +++ b/emu/netcons.c @@ -139,13 +139,6 @@ netconscycle(void *dev) break; } return; -err: - printf("error address %o\n", a); - nc->buf[0] = 1; - nc->buf[1] = 1; - nc->buf[2] = ERR; - writen(nc->fd, nc->buf, nc->buf[0]+2); - return; } Device* From 39031d04e6a8b1e8ef843dbfedeed208b43c7e54 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Mon, 17 Feb 2020 18:33:09 +0100 Subject: [PATCH 3/3] Ignore built pdp6 executable. --- emu/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 emu/.gitignore diff --git a/emu/.gitignore b/emu/.gitignore new file mode 100644 index 0000000..c28dc7c --- /dev/null +++ b/emu/.gitignore @@ -0,0 +1 @@ +pdp6