Merge branch 'master' into c_sp

2025-06-22 19:02:24 +00:00
parent 5a4b11e7ff 7573272836
commit a7af49a763
93 changed files with 5626 additions and 554 deletions
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -1,3 +1,9 @@
+# ---- Display info during parsing phase ----
+SILENT:=$(findstring s,$(word 1, $(MAKEFLAGS)))
+ifneq ($(SILENT),s)
+    $(info Using Makefile: $(realpath $(firstword $(MAKEFILE_LIST))) $(MAKECMDGOALS))
+endif
+
 ifneq ($(shell echo),)
  CMD_EXE = 1
 endif
--- a/libsrc/apple2/tgi/a2.hi.s
+++ b/libsrc/apple2/tgi/a2.hi.s
@@ -222,14 +222,9 @@ DONE:
        bit     TXTSET
        bit     LOWSCR

-        .ifndef __APPLE2ENH__
-        bit     machinetype
-        bpl     reset_wndtop
-        .endif
        ; Limit SET80COL-HISCR to text
        bit     LORES

-reset_wndtop:
        ; Reset the text window top
        lda     #$00
        sta     WNDTOP