From 5fb8aa332792d5ecfe8c36c368dfee535e93bfc9 Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Wed, 12 Jul 2023 15:26:17 -0700 Subject: [PATCH] Move font building to main makefile --- .gitignore | 1 + CompileFont.py | 4 ++-- Makefile | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e956375..72072d4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /gscats.2mg /fontEngine.lst /FONTBANK\#060000 +/Art/Generated diff --git a/CompileFont.py b/CompileFont.py index 983984d..3af3220 100755 --- a/CompileFont.py +++ b/CompileFont.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 import sys import PIL @@ -38,7 +38,7 @@ def main(argv): print ("\ttya") # Transfer character VRAM position from Y to stack pointer print ("\ttcs") - # Iteratre through all the pixels + # Iterate through all the pixels charOriginX = charX*CHAR_WIDTH charOriginY = charY*CHAR_HEIGHT diff --git a/Makefile b/Makefile index 3713c14..5a73d5f 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ SPRITEBANK=$(SPRITES)\#060000 FLIPLIST=$(wildcard Art/*Fan.gif) $(wildcard Art/*Spit*.gif) REMOTESYMBOLS=-Wl $(shell ./ParseMapFile.py *.map) -all: clean diskimage terrain_e1 $(PGM) loader emulate +all: clean diskimage terrain_e1 fonts $(PGM) loader emulate emulate: # Leading hypen needed because GSPlus maddeningly returns code 1 (error) always and for no reason @@ -53,6 +53,7 @@ $(PGM): $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(FONTBANK) rm -f $(CODEBANK) + rm -f $(FONTBANK) rm -f $(PGM).o rm -f terrain_e1.map @@ -68,6 +69,12 @@ terrain_e1: rm -f $(CODEBANKE1) rm -f terrain_e1.o +fonts: + rm -rf $(FONTBANK) + ./CompileFont.py > font8x8.s + @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh --cpu 65816 --start-addr 0000 -lfonts.lst fontEngine.s -o $(FONTBANK) + rm -f fontEngine.o + clean: rm -f $(PGM) rm -f $(PGM).o @@ -98,11 +105,4 @@ sound: rm -f $(GENSOUND)/* ./GenerateSoundBank.sh Sound/CatHowl.wav 11264 Sound/Meow1.wav 5513 Sound/Meow2.wav 5513 Sound/Meow3.wav 5513 Sound/Meow4.wav 5513 rm -f $(GENSOUND)/* - -.PHONY: fonts -fonts: - rm -rf $(FONTBANK) - ./CompileFont.py > font8x8.s - @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh --cpu 65816 --start-addr 0000 -lfonts.lst fontEngine.s -o $(FONTBANK) - rm -f fontEngine.o