1
0
mirror of https://github.com/simh/simh.git synced 2026-01-25 19:56:25 +00:00

Merge branch 'nj7p/swtp6800-v2.1'

Conflicts:
	makefile
	swtp6800/common/bootrom.c
	swtp6800/common/dc-4.c
	swtp6800/common/i2716.c
	swtp6800/common/m6800.c
	swtp6800/common/m6810.c
	swtp6800/common/mp-8m.c
	swtp6800/common/mp-a.c
	swtp6800/common/mp-a2.c
	swtp6800/common/mp-b2.c
	swtp6800/common/mp-s.c
	swtp6800/swtp6800/mp-a2_sys.c
	swtp6800/swtp6800/mp-a_sys.c
	swtp6800/swtp6800/swtp_defs.h
This commit is contained in:
Mark Pizzolato
2012-07-13 15:21:30 -07:00
4 changed files with 20 additions and 18 deletions

View File

@@ -839,3 +839,4 @@ swtp6800mp-a2 : ${BIN}swtp6800mp-a2${EXE}
${BIN}swtp6800mp-a2${EXE} : ${SWTP6800MP-A2} ${SIM}
${MKDIRBIN}
${CC} ${SWTP6800MP-A2} ${SIM} ${SWTP6800_OPT} $(CC_OUTSPEC) ${LDFLAGS}