Merge branch 'master' into master

.github/workflows/ccpp.yml

@@ -1,18 +1,18 @@
 name: C/C++ CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build-linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - name: apt update
       run: sudo apt update
     - name: add-apt-repository
       run: sudo add-apt-repository ppa:vriviere/ppa -y
     - name: apt
-      run: sudo apt install ninja-build lua5.1 pasmo libz80ex-dev flex libbsd-dev libreadline-dev bison binutils-arm-linux-gnueabihf binutils-i686-linux-gnu binutils-powerpc-linux-gnu binutils-m68k-atari-mint binutils-m68k-linux-gnu qemu-user gpp 64tass libfl-dev nasm
+      run: sudo apt install moreutils lua5.1 libz80ex-dev flex libbsd-dev libreadline-dev bison binutils-arm-linux-gnueabihf binutils-i686-linux-gnu binutils-powerpc-linux-gnu binutils-m68k-atari-mint binutils-m68k-linux-gnu qemu-user gpp 64tass libfl-dev nasm
     - name: make
-      run: make NINJAFLAGS=-k1
+      run: make -j$(nproc)
 

Makefile

@@ -1,20 +1,15 @@
 export OBJ = .obj
 export LUA = lua
+export CC = gcc
+export CXX = g++
+export AR = ar
 export CFLAGS = -g -O0
 export LDFLAGS = -g
 export NINJAFLAGS =
 
-all: $(OBJ)/build.ninja
-	@ninja -f $(OBJ)/build.ninja $(NINJAFLAGS)
+.PHONY: all
+all: +all
 
-clean:
-	@echo CLEAN
-	@rm -rf $(OBJ) bin
+TARGETS = +all
+include build/ab.mk
 
-lua-files = $(shell find . -name 'build*.lua') $(wildcard build/*.lua) toolchains.lua
-$(OBJ)/build.ninja: mkninja.lua Makefile $(lua-files)
-	@echo MKNINJA
-	@mkdir -p $(OBJ)
-	@$(LUA) \
-		mkninja.lua \
-		> $@

README.md

@@ -294,3 +294,6 @@ turn contains a copy of John R. Hauser's softfloat library, distributable under
 a custom but MIT-like license; see `third_party/musashi/softfloat/README.txt`
 for the text.
 
+`third_party/libz80ex` contains a copy of the z80ex Z80 emulation library,
+written [email protected]. It is distributable under the terms of the
+GPL GPL 2.0 license; see `third_party/z80ex/COPYING` for the text.

bootstrap/build.py

@@ -0,0 +1,6 @@
+from src.toolchains import cgen
+
+cgen(name="cowfe", srcs=["./cowfe-cgen.bootstrap.c"])
+cgen(name="cowbe", srcs=["./cowbe-cgen.bootstrap.c"])
+cgen(name="cowlink", srcs=["./cowlink-cgen.bootstrap.c"])
+cgen(name="cowwrap", srcs=["./cowwrap.bootstrap.c"])