# HG changeset patch # User Michael Pavone # Date 1632292159 25200 # Node ID c6ffbe21a1698f0101f63d69f3741a65b15df517 # Parent 275da208aa75a7ab6a6b89ac4ade9a60f3724195# Parent ed9a6de28158e094c9c26d68cbd07f269c300f5f Merge from mame_interp diff -r 275da208aa75 -r c6ffbe21a169 Makefile --- a/Makefile Tue Sep 21 23:23:52 2021 -0700 +++ b/Makefile Tue Sep 21 23:29:19 2021 -0700 @@ -184,7 +184,8 @@ TRANSOBJS=gen.o backend.o $(MEM) arena.o tern.o M68KOBJS=68kinst.o -ifdef NEW_CORE +NEW_CORE:=1 +ifeq ($(NEW_CORE),1) Z80OBJS=z80.o z80inst.o M68KOBJS+= m68k_core.o musashi/m68kops.o musashi/m68kcpu.o CFLAGS+= -DNEW_CORE @@ -344,12 +345,9 @@ vos_prog_info : vos_prog_info.o vos_program_module.o $(CC) -o vos_prog_info vos_prog_info.o vos_program_module.o - -m68k.c : m68k.cpu cpu_dsl.py - ./cpu_dsl.py -d call $< > $@ %.c : %.cpu cpu_dsl.py - ./cpu_dsl.py -d goto $< > $@ + ./cpu_dsl.py -d call $< > $@ %.db.c : %.db sed $< -e 's/"/\\"/g' -e 's/^\(.*\)$$/"\1\\n"/' -e'1s/^\(.*\)$$/const char $(shell echo $< | tr '.' '_')_data[] = \1/' -e '$$s/^\(.*\)$$/\1;/' > $@