From 256fb7c211ac789b7a749706c9b8cf2ac0e39140 Mon Sep 17 00:00:00 2001 From: Casey Zwicker Date: Sun, 2 Nov 2025 16:15:15 -0800 Subject: [PATCH 1/2] w65c02 instead of 65c02 so that wai instruction works on latest ca65 --- firmware/Makefile | 2 +- firmware/demos/Makefile | 2 +- firmware/for_template/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 33e8e9c..89c5c60 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,7 +1,7 @@ # Instruct that compilation and assembly should be done using cc65/ca65 and # specify some required flags (https://cc65.github.io/doc/customizing.html#toc9) AS = ca65 -ASFLAGS = --cpu 65c02 +ASFLAGS = --cpu w65c02 CC = cc65 CFLAGS = --cpu 65c02 -t none -O diff --git a/firmware/demos/Makefile b/firmware/demos/Makefile index b9d5526..2dc3f39 100644 --- a/firmware/demos/Makefile +++ b/firmware/demos/Makefile @@ -12,7 +12,7 @@ default: cp -r ${DEMO}/. ../template/. ifneq ("$(wildcard ${DEMO}/Makefile.top)","") @echo "Makefile.top found. Modifying default Makefile" - @echo "\n" >> ../template/Makefile.top + @echo -e "\n" >> ../template/Makefile.top @cat ../template/Makefile | sed -n '/${MAKEFILE_TOP_END}/,$$ p' >> ../template/Makefile.top @mv ../template/Makefile.top ../template/Makefile @echo "Created ${DEMO}'s Makefile" diff --git a/firmware/for_template/Makefile b/firmware/for_template/Makefile index 413a72c..07c6231 100644 --- a/firmware/for_template/Makefile +++ b/firmware/for_template/Makefile @@ -26,7 +26,7 @@ MACHINE = mapache64 # Instruct that compilation and assembly should be done using cc65/ca65 and # specify some required flags (https://cc65.github.io/doc/customizing.html#toc9) AS = ca65 -ASFLAGS = --cpu 65c02 +ASFLAGS = --cpu w65c02 CC = cc65 CFLAGS = --cpu 65c02 -t none -Oi From eae914c051b69770783bda5cddf158712730b451 Mon Sep 17 00:00:00 2001 From: Casey Zwicker Date: Sun, 9 Nov 2025 20:12:59 -0800 Subject: [PATCH 2/2] Revert "w65c02 instead of 65c02 so that wai instruction works on latest ca65" This reverts commit 256fb7c211ac789b7a749706c9b8cf2ac0e39140. --- firmware/Makefile | 2 +- firmware/demos/Makefile | 2 +- firmware/for_template/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 89c5c60..33e8e9c 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,7 +1,7 @@ # Instruct that compilation and assembly should be done using cc65/ca65 and # specify some required flags (https://cc65.github.io/doc/customizing.html#toc9) AS = ca65 -ASFLAGS = --cpu w65c02 +ASFLAGS = --cpu 65c02 CC = cc65 CFLAGS = --cpu 65c02 -t none -O diff --git a/firmware/demos/Makefile b/firmware/demos/Makefile index 2dc3f39..b9d5526 100644 --- a/firmware/demos/Makefile +++ b/firmware/demos/Makefile @@ -12,7 +12,7 @@ default: cp -r ${DEMO}/. ../template/. ifneq ("$(wildcard ${DEMO}/Makefile.top)","") @echo "Makefile.top found. Modifying default Makefile" - @echo -e "\n" >> ../template/Makefile.top + @echo "\n" >> ../template/Makefile.top @cat ../template/Makefile | sed -n '/${MAKEFILE_TOP_END}/,$$ p' >> ../template/Makefile.top @mv ../template/Makefile.top ../template/Makefile @echo "Created ${DEMO}'s Makefile" diff --git a/firmware/for_template/Makefile b/firmware/for_template/Makefile index 07c6231..413a72c 100644 --- a/firmware/for_template/Makefile +++ b/firmware/for_template/Makefile @@ -26,7 +26,7 @@ MACHINE = mapache64 # Instruct that compilation and assembly should be done using cc65/ca65 and # specify some required flags (https://cc65.github.io/doc/customizing.html#toc9) AS = ca65 -ASFLAGS = --cpu w65c02 +ASFLAGS = --cpu 65c02 CC = cc65 CFLAGS = --cpu 65c02 -t none -Oi