Move font building to main makefile

This commit is contained in:
blondie7575 2023-07-12 15:26:17 -07:00
parent a1d5abb963
commit 5fb8aa3327
3 changed files with 11 additions and 10 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/gscats.2mg
/fontEngine.lst
/FONTBANK\#060000
/Art/Generated

View File

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

View File

@ -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
@ -99,10 +106,3 @@ sound:
./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