updated for xa 2.4

cmosher01 · Sep 28, 2024 · 8ab5049 · 8ab5049
1 parent bd58588
commit 8ab5049
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -16,6 +16,7 @@ jobs:
           ./bootstrap
           ./configure
           make
+          make check
           mkdir apple2
           cd src
           find . -name \*.a65 | xargs cp -v --parents -t ../apple2/

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.61])
-AC_INIT([apple2sys],[1.2.0])
+AC_INIT([apple2sys],[1.2.1])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/dos/system/common/rwts.m4])
 AM_INIT_AUTOMAKE([-Wall -Werror])

diff --git a/src/dos/controller/common/Makefile.am b/src/dos/controller/common/Makefile.am
@@ -12,7 +12,7 @@ ZERO_SEGS=-bd 0 -bb 0 -bz 0
 
 #arbitrary code seg start (-bt 2048) because -bt 0 tends to cause strange errors
 .s65.o65:
-	$(XA65) -C -M -R -c -bt 2048 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
+	$(XA65) -C -MASM -XXA23 -R -c -bt 2048 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
 
 .o65.r65:
 	$(LDO65) -bt $(CODE_SEG) $(ZERO_SEGS) -o $@ $(LD65FLAGS) $^

diff --git a/src/dos/system/common/Makefile.am b/src/dos/system/common/Makefile.am
@@ -13,7 +13,7 @@ ZERO_SEGS=-bd 0 -bb 0 -bz 0
 	$(M4) -E -I $(INCDIR) -I $(COMDIR) $(M4FLAGS_LOCAL) $(M4FLAGS) $< >$@
 
 .s65.o65:
-	$(XA65) -C -M -R -c -bt 2048 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
+	$(XA65) -C -MASM -XXA23 -R -c -bt 2048 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
 
 .o65.r65:
 	$(LDO65) -bt $(CODE_SEG) $(ZERO_SEGS) -o $@ $(LD65FLAGS) $^

diff --git a/src/system/applesoft/Makefile.am b/src/system/applesoft/Makefile.am
@@ -11,7 +11,7 @@ ZEROSEGS=-bd 0 -bb 0 -bz 0
 	$(M4) -E -I $(INCDIR) $(M4FLAGS) $< >$@
 
 .s65.o65:
-	$(XA65) -C -M -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
+	$(XA65) -C -MASM -XXA23 -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
 
 .o65.r65:
 	$(LDO65) -bt $(CODE_SEG) $(ZERO_SEGS) -o $@ $(LD65FLAGS) $^

diff --git a/src/system/intbasic/Makefile.am b/src/system/intbasic/Makefile.am
@@ -11,7 +11,7 @@ ZEROSEGS=-bd 0 -bb 0 -bz 0
 	$(M4) -E -I $(INCDIR) $(M4FLAGS_LOCAL) $(M4FLAGS) $< >$@
 
 .s65.o65:
-	$(XA65) -C -M -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
+	$(XA65) -C -MASM -XXA23 -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
 
 .o65.r65:
 	$(LDO65) -bt $(CODE_SEG) $(ZERO_SEGS) -o $@ $(LD65FLAGS) $^

diff --git a/src/system/monitor/common/Makefile.am b/src/system/monitor/common/Makefile.am
@@ -9,7 +9,7 @@ ZEROSEGS=-bd 0 -bb 0 -bz 0
 	$(M4) -E -I $(INCDIR) -I $(COMDIR) $(M4FLAGS) $< >$@
 
 .s65.o65:
-	$(XA65) -C -M -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
+	$(XA65) -C -MASM -XXA23 -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
 
 .o65.r65:
 	$(LDO65) -bt $(CODE_SEG) $(ZERO_SEGS) -o $@ $(LD65FLAGS) $^

diff --git a/src/system/other/Makefile.am b/src/system/other/Makefile.am
@@ -11,7 +11,7 @@ ZEROSEGS=-bd 0 -bb 0 -bz 0
 	$(M4) -E -I $(INCDIR) $(M4FLAGS) $< >$@
 
 .s65.o65:
-	$(XA65) -C -M -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
+	$(XA65) -C -MASM -XXA23 -R -c -bt 0 $(ZERO_SEGS) -o $@ $(XA65FLAGS) $<
 
 .o65.r65:
 	$(LDO65) -bt $(CODE_SEG) $(ZERO_SEGS) -o $@ $(LD65FLAGS) $^