Add printing GIT_VERSION on MSX config screen

Author: FozzTexx

makefiles/common.mk

@@ -10,6 +10,10 @@ $(info Building for PLATFORM=$(PLATFORM))
 
 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 +37,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 +68,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 +93,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
 

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:
@@ -316,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):

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

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))

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

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

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

src/msx/screen.c

@@ -538,6 +538,7 @@ void screen_show_info(bool printerEnabled,AdapterConfig* ac)
   cprintf("%10s%02x:%02x:%02x:%02x:%02x:%02x\n","MAC:",ac->macAddress[0],ac->macAddress[1],ac->macAddress[2],ac->macAddress[3],ac->macAddress[4],ac->macAddress[5]);
   cprintf("%10s%02x:%02x:%02x:%02x:%02x:%02x\n","BSSID:",ac->bssid[0],ac->bssid[1],ac->bssid[2],ac->bssid[3],ac->bssid[4],ac->bssid[5]);
   cprintf("%10s%s\n","FNVER:",ac->fn_version);
+  cprintf("%10s%s\n","CONFIG:",GIT_VERSION);
 
   vdp_vfill(MODE2_ATTR+0x0700,0xF4,256);
   vdp_vfill(MODE2_ATTR+0x0800,0x1F,256);