commit f2da2dc

makefile

  1@@ -2,36 +2,36 @@ RELEASE_flags=-DNDEBUG -O2 -g0 -s
  2 DEBUG_flags=-std=c99 -D_POSIX_C_SOURCE=199309L -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined
  3 PREFIX=${HOME}/.local
  4 
  5-run: bin/uxn11 bin/m_pc.rom bin/perifs.rom
  6-	bin/uxn11 bin/m_pc.rom bin/perifs.rom run
  7-gui: bin/uxn11 bin/screen.rom
  8-	bin/uxn11 bin/screen.rom
  9-test: bin/uxn11-debug tests
 10-	@ -bin/uxn11-debug
 11-	@ -bin/uxn11-debug -v
 12-	@ bin/uxn11-debug bin/opctest.rom
 13-	@ bin/uxn11-debug bin/system.rom
 14-	@ printf "ghi" | bin/uxn11-debug bin/console.rom "abc" "def"
 15-	@ bin/uxn11-debug bin/file.rom
 16-	@ bin/uxn11-debug bin/datetime.rom
 17+run: bin/uxn12 bin/m_pc.rom bin/perifs.rom
 18+	bin/uxn12 bin/m_pc.rom bin/perifs.rom run
 19+gui: bin/uxn12 bin/screen.rom
 20+	bin/uxn12 bin/screen.rom
 21+test: bin/uxn12-debug tests
 22+	@ -bin/uxn12-debug
 23+	@ -bin/uxn12-debug -v
 24+	@ bin/uxn12-debug bin/opctest.rom
 25+	@ bin/uxn12-debug bin/system.rom
 26+	@ printf "ghi" | bin/uxn12-debug bin/console.rom "abc" "def"
 27+	@ bin/uxn12-debug bin/file.rom
 28+	@ bin/uxn12-debug bin/datetime.rom
 29 clean:
 30 	rm -fr bin
 31 format:
 32-	clang-format -i src/uxn11.c
 33-install: bin/uxn11
 34+	clang-format -i src/uxn12.c
 35+install: bin/uxn12
 36 	mkdir -p ${PREFIX}/bin
 37-	cp bin/uxn11 ${PREFIX}/bin
 38+	cp bin/uxn12 ${PREFIX}/bin
 39 	mkdir -p ${PREFIX}/share/man/man7
 40 	cp doc/man/uxntal.7 ${PREFIX}/share/man/man7
 41 uninstall:
 42-	rm -f ${PREFIX}/bin/uxn11
 43+	rm -f ${PREFIX}/bin/uxn12
 44 grab:
 45 	cp ../drifblim/etc/drifblim.rom.txt etc/utils/
 46 	cp ../uxn-utils/cli/opctest/src/opctest.tal etc/tests/
 47 	cp ../uxn-utils/gui/perifs/src/perifs.tal etc/tests/
 48 	cp ../m_pc/src/m_pc.tal etc/utils/
 49 archive:
 50-	cp src/uxn11.c ../oscean/etc/uxn11.c.txt
 51+	cp src/uxn12.c ../oscean/etc/uxn12.c.txt
 52 	cp doc/man/uxntal.7 ../oscean/etc/uxntal.7.txt
 53 	cp etc/tests/system.tal ../oscean/etc/varvara.system.tal.txt
 54 	cp etc/tests/console.tal ../oscean/etc/varvara.console.tal.txt
 55@@ -41,35 +41,35 @@ archive:
 56 
 57 .PHONY: run test clean format install uninstall grab archive
 58 
 59-bin/uxn11: src/uxn11.c
 60+bin/uxn12: src/uxn12.c
 61 	mkdir -p bin
 62-	cc ${RELEASE_flags} ${CFLAGS} src/uxn11.c -lX11 -lutil -o bin/uxn11
 63-bin/uxn11-debug: src/uxn11.c
 64+	cc ${RELEASE_flags} ${CFLAGS} -s src/uxn12.c src/xdg-shell-protocol.c -lwayland-client -lxkbcommon -o bin/uxn12
 65+bin/uxn12-debug: src/uxn12.c
 66 	mkdir -p bin
 67-	cc ${DEBUG_flags} ${CFLAGS} src/uxn11.c -lX11 -lutil -o bin/uxn11-debug
 68+	cc ${DEBUG_flags} ${CFLAGS} -s src/uxn12.c src/xdg-shell-protocol.c -lwayland-client -lxkbcommon -o bin/uxn12
 69 
 70 # Tools
 71 
 72-bin/drifblim.rom: bin/uxn11 etc/utils/drifblim.rom.txt
 73-	@ cat etc/utils/drifblim.rom.txt | bin/uxn11 etc/utils/xh.rom > bin/drifblim.rom
 74-bin/m_pc.rom: bin/uxn11 bin/drifblim.rom etc/utils/m_pc.tal
 75-	@ bin/uxn11 bin/drifblim.rom etc/utils/m_pc.tal bin/m_pc.rom
 76+bin/drifblim.rom: bin/uxn12 etc/utils/drifblim.rom.txt
 77+	@ cat etc/utils/drifblim.rom.txt | bin/uxn12 etc/utils/xh.rom > bin/drifblim.rom
 78+bin/m_pc.rom: bin/uxn12 bin/drifblim.rom etc/utils/m_pc.tal
 79+	@ bin/uxn12 bin/drifblim.rom etc/utils/m_pc.tal bin/m_pc.rom
 80 
 81 # Tests
 82 
 83 tests: bin/opctest.rom bin/system.rom bin/console.rom bin/screen.rom bin/perifs.rom bin/file.rom bin/datetime.rom
 84 
 85-bin/opctest.rom: bin/uxn11 bin/drifblim.rom etc/tests/opctest.tal
 86-	@ bin/uxn11 bin/drifblim.rom etc/tests/opctest.tal bin/opctest.rom
 87-bin/system.rom: bin/uxn11 bin/drifblim.rom etc/tests/system.tal
 88-	@ bin/uxn11 bin/drifblim.rom etc/tests/system.tal bin/system.rom
 89-bin/console.rom: bin/uxn11 bin/drifblim.rom etc/tests/console.tal
 90-	@ bin/uxn11 bin/drifblim.rom etc/tests/console.tal bin/console.rom
 91-bin/screen.rom: bin/uxn11 bin/drifblim.rom etc/tests/screen.bounds.tal
 92-	@ bin/uxn11 bin/drifblim.rom etc/tests/screen.bounds.tal bin/screen.rom
 93-bin/perifs.rom: bin/uxn11 bin/drifblim.rom etc/tests/perifs.tal
 94-	@ bin/uxn11 bin/drifblim.rom etc/tests/perifs.tal bin/perifs.rom
 95-bin/file.rom: bin/uxn11 bin/drifblim.rom etc/tests/file.tal
 96-	@ bin/uxn11 bin/drifblim.rom etc/tests/file.tal bin/file.rom
 97-bin/datetime.rom: bin/uxn11 bin/drifblim.rom etc/tests/datetime.tal
 98-	@ bin/uxn11 bin/drifblim.rom etc/tests/datetime.tal bin/datetime.rom
 99+bin/opctest.rom: bin/uxn12 bin/drifblim.rom etc/tests/opctest.tal
100+	@ bin/uxn12 bin/drifblim.rom etc/tests/opctest.tal bin/opctest.rom
101+bin/system.rom: bin/uxn12 bin/drifblim.rom etc/tests/system.tal
102+	@ bin/uxn12 bin/drifblim.rom etc/tests/system.tal bin/system.rom
103+bin/console.rom: bin/uxn12 bin/drifblim.rom etc/tests/console.tal
104+	@ bin/uxn12 bin/drifblim.rom etc/tests/console.tal bin/console.rom
105+bin/screen.rom: bin/uxn12 bin/drifblim.rom etc/tests/screen.bounds.tal
106+	@ bin/uxn12 bin/drifblim.rom etc/tests/screen.bounds.tal bin/screen.rom
107+bin/perifs.rom: bin/uxn12 bin/drifblim.rom etc/tests/perifs.tal
108+	@ bin/uxn12 bin/drifblim.rom etc/tests/perifs.tal bin/perifs.rom
109+bin/file.rom: bin/uxn12 bin/drifblim.rom etc/tests/file.tal
110+	@ bin/uxn12 bin/drifblim.rom etc/tests/file.tal bin/file.rom
111+bin/datetime.rom: bin/uxn12 bin/drifblim.rom etc/tests/datetime.tal
112+	@ bin/uxn12 bin/drifblim.rom etc/tests/datetime.tal bin/datetime.rom