From 074c934fe2ee39472beb0e9178faaf9d0a8eb78a Mon Sep 17 00:00:00 2001
From: Philip Zembrod <pzembrod@gmail.com>
Date: Tue, 8 Oct 2024 22:20:11 +0200
Subject: [PATCH] Use vf-core.fth to build v4th.com

---
 8080/CPM/Makefile     | 11 +++++++----
 8080/CPM/src/v4th.fth |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/8080/CPM/Makefile b/8080/CPM/Makefile
index 39088f7..fffa3cf 100644
--- a/8080/CPM/Makefile
+++ b/8080/CPM/Makefile
@@ -21,7 +21,9 @@ clean:
 veryclean: clean
 	rm -rf $(cpmfilesdir)
 
-test: logtest.result inctest.result test-min.result test-v4th.result
+test: test-v4th.result
+
+alltests: logtest.result inctest.result test-min.result test-v4th.result
 
 run-editor: | msdos
 	FORTHPATH="f:\\src;f:\\tests;f:\\msdos" \
@@ -78,9 +80,9 @@ inctest.log: \
 
 $(cpmfilesdir)/v4th.com: \
     $(patsubst %, $(cpmfilesdir)/%, volks4th.com \
-    include.fb log2file.fb target.fb source.fb v4th.fth) Makefile \
-    | emu
-	rm -f $(runcpmdir)/A/0/KERNEL.COM
+    include.fb log2file.fb target.fb source.fb v4th.fth vf-core.fth) \
+    Makefile | emu
+	rm -f $(runcpmdir)/A/0/V4TH.COM $@
 	./emulator/run-in-runcpm.sh \
 	    "volks4th" \
 	    "include log2file.fb" \
@@ -98,6 +100,7 @@ v4th2.com: \
     $(patsubst %, $(cpmfilesdir)/%, volks4th.com \
     include.fb log2file.fb target.fb source.fb) \
     | emu
+	rm -f $(runcpmdir)/A/0/KERNEL.COM $@
 	./emulator/run-in-runcpm.sh \
 	    "volks4th" \
 	    "include log2file.fb" \
diff --git a/8080/CPM/src/v4th.fth b/8080/CPM/src/v4th.fth
index ceb3115..c2e9993 100644
--- a/8080/CPM/src/v4th.fth
+++ b/8080/CPM/src/v4th.fth
@@ -3,8 +3,9 @@ Onlyforth
     $9000 displace !
 Target definitions   $100 here!
 
+  include vf-core.fth
   use source.fb
-  2 $75 thru    \ Standard 8080-System
+  $54 $75 thru    \ Standard 8080-System
 
 cr .( unresolved: )  .unresolved   ( ' .blk is .status )