From a153eaf6c4432a323e986e1899c132f858e21d95 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Tue, 15 Jan 2019 09:04:25 +0100 Subject: [PATCH] PDP-6 simulator submodule. --- .gitmodules | 3 +++ Makefile | 8 ++++++-- build/dependencies.sh | 3 ++- tools/pdp6 | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) create mode 160000 tools/pdp6 diff --git a/.gitmodules b/.gitmodules index 04e89d82..b6382f2b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "tools/tv11"] path = tools/tv11 url = https://github.com/aap/tv11 +[submodule "tools/pdp6"] + path = tools/pdp6 + url = https://github.com/aap/pdp6 diff --git a/Makefile b/Makefile index 631641c0..3239cc6d 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ BINIGNORE=-e '^(ka10|ks10|sys)$$' # These are on the minsrc tape. SRCIGNORE=-e '^(system|midas)$$' -SUBMODULES = dasm itstar klh10 mldev simh sims supdup tapeutils tv11 +SUBMODULES = dasm itstar klh10 mldev simh sims supdup tapeutils tv11 pdp6 # These files are used to create bootable tape images. RAM = bin/ks10/boot/ram.262 @@ -61,6 +61,7 @@ WRITETAPE=tools/tapeutils/tapewrite MAGFRM=tools/dasm/magfrm GT40=tools/simh/BIN/pdp11 $(OUT)/bootvt.img TV11=tools/tv11/tv11 +PDP6=tools/pdp6/emu/pdp6 H3TEXT=$(shell cd build; ls h3text.*) DDT=$(shell cd src; ls sysen1/ddt.* syseng/lsrtns.* syseng/msgs.* syseng/datime.*) @@ -80,7 +81,7 @@ out/klh10/stamp: $(OUT)/rp0.dsk out/simh/stamp: $(OUT)/rp0.dsk $(GT40) $(TOUCH) $@ -out/sims/stamp: $(OUT)/rp03.2 $(OUT)/rp03.3 $(GT40) $(TV11) +out/sims/stamp: $(OUT)/rp03.2 $(OUT)/rp03.3 $(GT40) $(TV11) $(PDP6) $(TOUCH) $@ $(OUT)/rp0.dsk: build/simh/init $(OUT)/minsys.tape $(OUT)/minsrc.tape $(OUT)/salv.tape $(OUT)/dskdmp.tape build/build.tcl $(OUT)/sources.tape build/$(EMULATOR)/stamp @@ -218,6 +219,9 @@ $(TV11): $(MAKE) -C tools/tv11 $(MAKE) -C tools/tv11/tvcon +$(PDP6): + $(MAKE) -C tools/pdp6/emu + tools/supdup/supdup: $(MAKE) -C tools/supdup diff --git a/build/dependencies.sh b/build/dependencies.sh index 28507ff5..ccc53278 100644 --- a/build/dependencies.sh +++ b/build/dependencies.sh @@ -12,7 +12,8 @@ install_linux() { case "$EMULATOR" in simh) sudo apt-get install -y simh;; sims) sudo apt-get install -y libegl1-mesa-dev libgles2-mesa-dev - sudo apt-get install -y libx11-dev libxt-dev libsdl2-dev;; + sudo apt-get install -y libx11-dev libxt-dev libsdl2-dev + sudo apt-get install -y libsdl-dev libsdl-image1.2-dev;; klh10) sudo apt-get install -y libusb-1.0-0-dev;; esac } diff --git a/tools/pdp6 b/tools/pdp6 new file mode 160000 index 00000000..ef0693e9 --- /dev/null +++ b/tools/pdp6 @@ -0,0 +1 @@ +Subproject commit ef0693e92701cc2f60ae01af7123c6c30515fc44