Mercurial > repos > blastem

changeset 783:e64975fc5f98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix stateview build and fix Makefile to use /bin/echo since builtin echo does not always support -e
author Michael Pavone <pavone@retrodev.com>
date Tue, 21 Jul 2015 00:52:21 -0700
parents c63ed5db68b6
children c3e3a0d734e2
files Makefile stateview.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Jul 21 00:41:39 2015 -0700
+++ b/Makefile	Tue Jul 21 00:52:21 2015 -0700
@@ -22,7 +22,7 @@
 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
--- a/stateview.c	Tue Jul 21 00:41:39 2015 -0700
+++ b/stateview.c	Tue Jul 21 00:52:21 2015 -0700
@@ -15,6 +15,9 @@
 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;