From e7b2812fbdb135338db7a5bade0db8a16dc772b2 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 21 Jul 2015 00:52:21 -0700 Subject: Fix stateview build and fix Makefile to use /bin/echo since builtin echo does not always support -e --- Makefile | 2 +- stateview.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3ec9807..40ffb72 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ else LIBS=sdl2 glew gl endif #Darwin -HAS_PROC:=$(shell if [ -d /proc ]; then echo -e -DHAS_PROC; fi) +HAS_PROC:=$(shell if [ -d /proc ]; then /bin/echo -e -DHAS_PROC; fi) CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value -Wno-logical-op-parentheses $(HAS_PROC) FIXUP:= ifdef PORTABLE diff --git a/stateview.c b/stateview.c index 0d2286d..751d2af 100644 --- a/stateview.c +++ b/stateview.c @@ -15,6 +15,9 @@ io_port gamepad_2; uint8_t reset = 1; uint8_t busreq = 0; +uint16_t ram[RAM_WORDS]; +uint8_t z80_ram[Z80_RAM_BYTES]; + uint16_t read_dma_value(uint32_t address) { return 0; -- cgit v1.2.3