Update to latest MekkoGX makefiles

FozzTexx · FozzTexx · commit abcf08e1bfc8 · 2025-10-24T07:01:00.000-07:00
diff --git a/makefiles/0_DO_NOT_CUSTOMIZE_THESE_FILES.md b/makefiles/0_DO_NOT_CUSTOMIZE_THESE_FILES.md
@@ -0,0 +1 @@
+README.md
diff --git a/makefiles/common.mk b/makefiles/common.mk
@@ -8,8 +8,16 @@ PLATFORM := $(basename $(notdir $(lastword $(PLATFORM_MK))))
 PLATFORM_UC := $(shell echo "$(PLATFORM)" | tr '[:lower:]' '[:upper:]')
 $(info Building for PLATFORM=$(PLATFORM))
 
+# Add GIT_VERSION macro define to CFLAGS, includes tag if available,
+# short commit hash, appends '*' if changes haven't been commited
+CFLAGS += -DGIT_VERSION='\"$(shell git rev-parse --short HEAD)$(shell git status --porcelain | grep -q '^[ MADRCU]' && echo '*')\"'
+
 include $(MWD)/../Makefile
 
+# Add GIT_VERSION macro define to CFLAGS, includes tag if available,
+# short commit hash, appends '*' if changes haven't been commited
+CFLAGS += -DGIT_VERSION='\"$(shell git rev-parse --short HEAD)$(shell git status --porcelain | grep -q '^[ MADRCU]' && echo '*')\"'
+
 IS_LIBRARY := $(if $(filter %.lib,$(PRODUCT)),1,0)
 ifeq ($(IS_LIBRARY),1)
   PRODUCT_BASE = $(basename $(PRODUCT))
@@ -33,6 +41,10 @@ ifneq ($(strip $(LD_$(TOOLCHAIN_UC))),)
 LD_DEFAULT = $(LD_$(TOOLCHAIN_UC))
 endif
 
+ifneq ($(strip $(PC_$(TOOLCHAIN_UC))),)
+PC_DEFAULT = $(PC_$(TOOLCHAIN_UC))
+endif
+
 R2R_PD := $(R2R_DIR)/$(PLATFORM)
 OBJ_DIR := $(BUILD_DIR)/$(PLATFORM)
 CACHE_PLATFORM := $(CACHE_DIR)/$(PLATFORM)
@@ -60,16 +72,16 @@ SRC_DIRS_EXPANDED := $(call expand_platform_pattern,$(SRC_DIRS))
 CFILES := $(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.c))
 AFILES := $(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.s)) \
           $(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.asm))
+PFILES := $(foreach dir,$(SRC_DIRS_EXPANDED),$(wildcard $(dir)/*.pas))
 
 # Need two steps: AFILES may be .s or .asm; `make` swaps one suffix at a time
 NORM_AFILES := $(AFILES:.asm=.s)
-OBJS := $(addprefix $(OBJ_DIR)/, $(notdir $(CFILES:.c=.o) $(NORM_AFILES:.s=.o)))
+OBJS := $(addprefix $(OBJ_DIR)/, $(notdir $(CFILES:.c=.o) $(NORM_AFILES:.s=.o) $(PFILES:.pas=.o)))
 
 $(BUILD_EXEC):: $(OBJS) $(EXECUTABLE_EXTRA_DEPS_$(PLATFORM_UC)) | $(R2R_PD)
 	$(call link-bin,$@,$(OBJS))
 	@$(MAKE) -f $(PLATFORM_MK) $(PLATFORM)/executable-post
 
-$(info LIBRARY=$(BUILD_LIB))
 $(BUILD_LIB):: $(OBJS) $(LIBRARY_EXTRA_DEPS_$(PLATFORM_UC)) | $(R2R_PD)
 	$(call link-lib,$@,$(OBJS))
 	@$(MAKE) -f $(PLATFORM_MK) $(PLATFORM)/library-post
@@ -85,10 +97,13 @@ $(OBJ_DIR)/%.o: %.s | $(OBJ_DIR)
 	$(call assemble,$@,$<)
 $(OBJ_DIR)/%.o: %.asm | $(OBJ_DIR)
 	$(call assemble,$@,$<)
+$(OBJ_DIR)/%.o: %.pas | $(OBJ_DIR)
+	$(call compile-pas,$@,$<)
 
 vpath %.c $(SRC_DIRS_EXPANDED)
 vpath %.s $(SRC_DIRS_EXPANDED)
 vpath %.asm $(SRC_DIRS_EXPANDED)
+vpath %.pas $(SRC_DIRS_EXPANDED)
 
 .PHONY: clean debug r2r $(PLATFORM)/r2r disk $(PLATFORM)/disk
 
diff --git a/makefiles/fnlib.py b/makefiles/fnlib.py
@@ -201,7 +201,7 @@ def getVersion(self):
         return
       if self.skipIfMissing:
         exit(0)
-      error_exit(f"No library found for \"{self.PLATFORM}\"")
+      #error_exit(f"No library found for \"{self.PLATFORM}\"")
 
     # No version was specified, so any version is fine
     if self.MV.FUJINET_LIB_VERSION:
@@ -284,8 +284,7 @@ def gitClone(self, url):
         cmd.extend(["-b", branch])
       subprocess.run(cmd, cwd=FUJINET_CACHE_DIR, check=True)
 
-    possibleOutput = ["build", *[f"r2r/{p}"
-                                 for p in self.possiblePlatforms.get(self.PLATFORM, [])]]
+    possibleOutput = ["build", *[f"r2r/{p}" for p in self.possiblePlatforms]]
     self.findLibraryDir(repoDir, possibleOutput)
     if not self.MV.FUJINET_LIB_FILE:
       cmd = ["make", ]
@@ -305,7 +304,6 @@ def findLibraryDir(self, baseDir, dirsToCheck):
             raise ValueError("What platform?", rxm)
           self.MV.FUJINET_LIB_FILE = rxm.group(0)
           return rxm
-    raise ValueError("No library dir")
     return None
 
   def getInclude(self):
@@ -318,8 +316,9 @@ def getInclude(self):
       if os.path.exists(os.path.join(idir, "fujinet-fuji.h")):
         self.MV.FUJINET_LIB_INCLUDE = idir
         return
+    if self.skipIfMissing:
+      exit(0)
     raise ValueError("Unable to find include directory", self.MV.FUJINET_LIB_DIR)
-
     return
 
   def printMakeVariables(self):
diff --git a/makefiles/platforms/atari-pas.mk b/makefiles/platforms/atari-pas.mk
@@ -0,0 +1,9 @@
+EXECUTABLE = $(R2R_PD)/$(PRODUCT_BASE).xex
+LIBRARY = $(R2R_PD)/$(PRODUCT_BASE).$(PLATFORM).lib
+
+MWD := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)
+include $(MWD)/common.mk
+include $(MWD)/toolchains/madpas.mk
+
+r2r:: $(BUILD_EXEC) $(BUILD_LIB) $(R2R_EXTRA_DEPS_$(PLATFORM_UC))
+	make -f $(PLATFORM_MK) $(PLATFORM)/r2r-post
diff --git a/makefiles/platforms/atari.mk b/makefiles/platforms/atari.mk
@@ -14,6 +14,7 @@ ATRBOOT := $(CACHE_PLATFORM)/$(PICOBOOT_BIN)
 
 $(BUILD_DISK): $(BUILD_EXEC) $(ATRBOOT) $(DISK_EXTRA_DEPS_$(PLATFORM_UC)) | $(R2R_PD)
 	$(RM) $@
+	$(RM) -rf $(CACHE_PLATFORM)/disk
 	$(MKDIR_P) $(CACHE_PLATFORM)/disk
 	cp $< $(CACHE_PLATFORM)/disk
 	dir2atr -m -S -B $(ATRBOOT) $@ $(CACHE_PLATFORM)/disk
diff --git a/makefiles/platforms/c16.mk b/makefiles/platforms/c16.mk
@@ -0,0 +1,9 @@
+EXECUTABLE = $(R2R_PD)/$(PRODUCT_BASE).prg
+LIBRARY = $(R2R_PD)/$(PRODUCT_BASE).$(PLATFORM).lib
+
+MWD := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)
+include $(MWD)/common.mk
+include $(MWD)/toolchains/cc65.mk
+
+r2r:: $(BUILD_EXEC) $(BUILD_LIB) $(R2R_EXTRA_DEPS_$(PLATFORM_UC))
+	make -f $(PLATFORM_MK) $(PLATFORM)/r2r-post
diff --git a/makefiles/platforms/pc6001.mk b/makefiles/platforms/pc6001.mk
@@ -0,0 +1,15 @@
+EXECUTABLE = $(R2R_PD)/$(PRODUCT_BASE).ptp
+LIBRARY = $(R2R_PD)/$(PRODUCT_BASE).$(PLATFORM).lib
+AS_DEFAULT = zcc
+
+MWD := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)
+include $(MWD)/common.mk
+include $(MWD)/toolchains/z88dk.mk
+
+$(PLATFORM_UC)_FLAGS = +$(PLATFORM)
+CFLAGS += $($(PLATFORM_UC)_FLAGS)
+ASFLAGS += $($(PLATFORM_UC)_FLAGS) -c
+LDFLAGS += $($(PLATFORM_UC)_FLAGS)
+
+r2r:: $(BUILD_EXEC) $(BUILD_LIB) $(R2R_EXTRA_DEPS_$(PLATFORM_UC))
+	make -f $(PLATFORM_MK) $(PLATFORM)/r2r-post
diff --git a/makefiles/platforms/pmd85.mk b/makefiles/platforms/pmd85.mk
@@ -6,10 +6,10 @@ MWD := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)
 include $(MWD)/common.mk
 include $(MWD)/toolchains/z88dk.mk
 
-PMD85_FLAGS = +pmd85
-CFLAGS += $(PMD85_FLAGS)
-ASFLAGS += $(PMD85_FLAGS) -c
-LDFLAGS += $(PMD85_FLAGS)
+$(PLATFORM_UC)_FLAGS = +$(PLATFORM)
+CFLAGS += $($(PLATFORM_UC)_FLAGS)
+ASFLAGS += $($(PLATFORM_UC)_FLAGS) -c
+LDFLAGS += $($(PLATFORM_UC)_FLAGS)
 
 r2r:: $(BUILD_EXEC) $(BUILD_LIB) $(R2R_EXTRA_DEPS_$(PLATFORM_UC))
 	make -f $(PLATFORM_MK) $(PLATFORM)/r2r-post
diff --git a/makefiles/platforms/vic20.mk b/makefiles/platforms/vic20.mk
@@ -0,0 +1,9 @@
+EXECUTABLE = $(R2R_PD)/$(PRODUCT_BASE).prg
+LIBRARY = $(R2R_PD)/$(PRODUCT_BASE).$(PLATFORM).lib
+
+MWD := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)
+include $(MWD)/common.mk
+include $(MWD)/toolchains/cc65.mk
+
+r2r:: $(BUILD_EXEC) $(BUILD_LIB) $(R2R_EXTRA_DEPS_$(PLATFORM_UC))
+	make -f $(PLATFORM_MK) $(PLATFORM)/r2r-post
diff --git a/makefiles/tc-common.mk b/makefiles/tc-common.mk
@@ -8,11 +8,13 @@ CC_$(TOOLCHAIN_UC) ?= $(CC_DEFAULT)
 AS_$(TOOLCHAIN_UC) ?= $(AS_DEFAULT)
 LD_$(TOOLCHAIN_UC) ?= $(LD_DEFAULT)
 AR_$(TOOLCHAIN_UC) ?= $(AR_DEFAULT)
+PC_$(TOOLCHAIN_UC) ?= $(PC_DEFAULT)
 
 CC := $(CC_$(TOOLCHAIN_UC))
 AS := $(AS_$(TOOLCHAIN_UC))
 LD := $(LD_$(TOOLCHAIN_UC))
 AR := $(AR_$(TOOLCHAIN_UC))
+PC := $(PC_$(TOOLCHAIN_UC))
 
 EXTRA_INCLUDE_$(TOOLCHAIN_UC) += $(EXTRA_INCLUDE) $(EXTRA_INCLUDE_$(PLATFORM_UC))
 CFLAGS += $(CFLAGS_EXTRA_$(TOOLCHAIN_UC)) $(CFLAGS_EXTRA_$(PLATFORM_UC))
diff --git a/makefiles/toolchains/cc65.mk b/makefiles/toolchains/cc65.mk
@@ -1,4 +1,4 @@
-CC_DEFAULT ?= cl65 --color off
+CC_DEFAULT ?= cl65
 AS_DEFAULT ?= $(CC_DEFAULT)
 LD_DEFAULT ?= $(CC_DEFAULT)
 AR_DEFAULT ?= ar65
diff --git a/makefiles/toolchains/cmoc.mk b/makefiles/toolchains/cmoc.mk
@@ -9,13 +9,9 @@ CFLAGS += --intdir=$(OBJ_DIR)
 ASFLAGS +=
 LDFLAGS +=
 
-# Needed because of using sed to strip ANSI color escape sequences
+# Needed because of using sed on error messages
 SHELL = /bin/bash -o pipefail
 
-define strip-ansi
-  sed -e 's/'$$'\033''[[][0-9][0-9]*m//g'
-endef
-
 define include-dir-flag
   -I$1
 endef
@@ -37,13 +33,13 @@ define link-lib
 endef
 
 define link-bin
-  $(LD) -o $1 $(LDFLAGS) $2 $(LIBS) 2>&1 | $(strip-ansi)
+  $(LD) -o $1 $(LDFLAGS) $2 $(LIBS)
 endef
 
 define compile
-  $(CC) -c $(CFLAGS) --deps=$(OBJ_DIR)/$(basename $(notdir $2)).d -o $1 $2 2>&1 | $(strip-ansi)
+  $(CC) -c $(CFLAGS) --deps=$(OBJ_DIR)/$(basename $(notdir $2)).d -o $1 $2
 endef
 
 define assemble
-  $(AS) -c $(ASFLAGS) -o $1 $2 2>&1 | $(strip-ansi) | sed -e 's/^\(.*\)(\([0-9][0-9]*\)) :/\1:\2:/'
+  $(AS) -c $(ASFLAGS) -o $1 $2 2>&1 | sed -e 's/^\(.*\)(\([0-9][0-9]*\)) :/\1:\2:/'
 endef
diff --git a/makefiles/toolchains/madpas-build.py b/makefiles/toolchains/madpas-build.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+import argparse
+import tempfile
+import subprocess
+import os
+import shlex
+
+def build_argparser():
+  parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+  parser.add_argument("ofile", nargs="+", help="pseudo object file")
+  parser.add_argument("-o", "--output", help="save output into")
+  parser.add_argument("-L", "--unit-path", action="append",
+                      help="Add directory to the Pascal unit include path")
+  parser.add_argument("-I", "--include-path", action="append",
+                      help="Add directory to the mads assembler include path")
+  parser.add_argument("--rc", help="rc file")
+  parser.add_argument("--flag", action="store_true", help="flag to do something")
+  return parser
+
+def is_unit_file(path):
+  with open(path, 'r') as f:
+    for line in f:
+      if line.strip().lower().startswith("unit "):
+        return True
+  return False
+
+def main():
+  args = build_argparser().parse_args()
+
+  pascal_files = []
+  assembly_files = []
+  for path in args.ofile:
+    with open(path, "r") as file:
+      component = file.readline().strip().split(maxsplit=2)
+      if component[1] == "rcpascal":
+        pascal_files.append(component[2])
+        continue
+
+      assembly_files.append(component)
+
+  if len(pascal_files) != 1:
+    # Remove unit files from the list and make sure that they have an
+    # uppercase bas and lowercase extension because Mad-Pascal changes
+    # the case of filenames.
+    unit_files = [x for x in pascal_files if is_unit_file(x)]
+    for unit in unit_files:
+      unit_dir = os.path.dirname(unit)
+      unit_base, unit_ext = os.path.splitext(os.path.basename(unit))
+      unit_base_uc = unit_base.upper()
+      unit_uc = os.path.join(unit_dir, unit_base_uc + unit_ext)
+      if not os.path.exists(unit_uc):
+        os.symlink(unit_base + unit_ext, unit_uc)
+    pascal_files = list(set(pascal_files) - set(unit_files))
+    if len(pascal_files) != 1:
+      print("Wrong amount of Pascal files", pascal_files)
+      exit(1)
+
+  pas_path = pascal_files[0]
+
+  workdir = os.path.abspath(os.path.dirname(pas_path))
+  if assembly_files:
+    tfile = tempfile.NamedTemporaryFile(mode="w+t", suffix=".rc", dir=workdir,
+                                        delete_on_close=False)
+    for asm in assembly_files:
+      asm_path = os.path.abspath(asm[2])
+      asm_rel = os.path.relpath(asm_path, workdir)
+      print(" ".join([asm[0], asm[1], asm_rel]), file=tfile)
+
+    if args.rc:
+      raise NotImplementedError
+
+    tfile.close()
+
+    ptemp = tempfile.NamedTemporaryFile(mode="w+t", suffix=".pas", dir=workdir,
+                                        delete_on_close=False)
+    with open(pas_path, "r+t") as pfile:
+      for line in pfile:
+        ptemp.write(line)
+    #print(f"{{$r {os.path.basename(tfile.name)}}}", file=ptemp)
+    ptemp.close()
+
+    pas_path = ptemp.name
+
+  cmd = ["mp", os.path.relpath(pas_path, workdir)]
+  for unit_path in args.unit_path:
+    cmd.append(f"-ipath:{unit_path}")
+  atemp = tempfile.NamedTemporaryFile(suffix=".asm", dir=workdir,
+                                      delete_on_close=False)
+  cmd.append(f"-o:{os.path.relpath(atemp.name, workdir)}")
+  print(" ".join([shlex.quote(x) for x in cmd]), flush=True)
+  try:
+    # FIXME - filter output from command to rewrite error lines so they name the input file
+    subprocess.run(cmd, cwd=workdir, check=True, stderr=subprocess.STDOUT)
+  except:
+    print("Failed to compile")
+    exit(1)
+
+  del tfile, ptemp
+
+  cmd = ["mads", atemp.name, "-x"]
+  for include_path in args.include_path:
+    cmd.append(f"-i:{include_path}")
+  if args.output:
+    output_path = os.path.abspath(args.output)
+    cmd.append(f"-o:{output_path}")
+  print(" ".join([shlex.quote(x) for x in cmd]), flush=True)
+  subprocess.run(cmd, cwd=workdir, check=True, stderr=subprocess.STDOUT)
+
+  return
+
+if __name__ == "__main__":
+  exit(main() or 0)
diff --git a/makefiles/toolchains/madpas.mk b/makefiles/toolchains/madpas.mk
@@ -0,0 +1,37 @@
+# Mad-Pascal doesn't produce .o files. In this setup, we treat Mad-Pascal as the "linker":
+# 1. Compile and assemble stages generate fake .o files that record
+#    the source file names.
+# 2. During the link stage, the madpas-build.py wrapper collects all
+#    source files from the fake .o files and passes them to Mad-Pascal
+#    to produce the final binary.
+
+include $(MWD)/tc-common.mk
+
+MADS_LIBS += \
+  --unit-path /usr/local/share/mads/lib \
+  --unit-path /usr/local/share/mads/blibs \
+  --include-path /usr/local/share/mads/base
+
+define library-dir-flag
+  --unit-path $1
+endef
+
+define link-lib
+  @echo "Mad-Pascal does not create libaries" ; exit 1
+endef
+
+define link-bin
+  $(MWD)/toolchains/madpas-build.py $(MADS_LIBS) -o $1 $2
+endef
+
+define compile
+  @echo "Mad-Pascal does not support C" ; exit 1
+endef
+
+define assemble
+  echo "$(basename $(notdir $2)) rcasm $2" > $1
+endef
+
+define compile-pas
+  echo "$(basename $(notdir $2)) rcpascal $2" > $1
+endef
diff --git a/makefiles/toolchains/ow2.mk b/makefiles/toolchains/ow2.mk
@@ -5,7 +5,7 @@ LD_DEFAULT ?= wlink OPTION quiet
 include $(MWD)/tc-common.mk
 CFLAGS += -0 -bt=dos -ms -s -osh -zu
 ASFLAGS +=
-LDFLAGS += SYSTEM dos OPTION MAP LIBPATH $(FUJINET_LIB_DIR)
+LDFLAGS += SYSTEM dos LIBPATH $(FUJINET_LIB_DIR)
 
 define include-dir-flag
   -I$1
