Reorganized demo directory structure`

demo/sprite_compiler/Makefile

@@ -1,22 +1,23 @@
-COLORSPRITE = moldy_burger.png
-BWSPRITE = apple-sprite9x11.png
+COLORSPRITE = ../sprites/moldy_burger.png
+BWSPRITE = ../sprites/apple-sprite9x11.png
+ASMGEN = python ../../asmgen.py
 
 all: cpbg.dsk fonttest.dsk
 
 rowlookup.s: asmgen.py
-	python asmgen.py -a mac65 -p 6502 -r > rowlookup.s
+	$(ASMGEN) -a mac65 -p 6502 -r > rowlookup.s
 
 collookupbw.s: asmgen.py
-	python asmgen.py -a mac65 -p 6502 -s hgrbw -c > collookupbw.s
+	$(ASMGEN) -a mac65 -p 6502 -s hgrbw -c > collookupbw.s
 
 collookupcolor.s: asmgen.py
-	python asmgen.py -a mac65 -p 6502 -c > collookupcolor.s
+	$(ASMGEN) -a mac65 -p 6502 -c > collookupcolor.s
 
 bwsprite.s: asmgen.py collookupbw.s rowlookup.s $(BWSPRITE)
-	python asmgen.py -a mac65 -p 6502 -s hgrbw $(BWSPRITE) -n bwsprite -m -b > bwsprite.s
+	$(ASMGEN) -a mac65 -p 6502 -s hgrbw $(BWSPRITE) -n bwsprite -m -b > bwsprite.s
 
 colorsprite.s: asmgen.py collookupcolor.s rowlookup.s $(COLORSPRITE)
-	python asmgen.py -a mac65 -p 6502 -s hgrcolor $(COLORSPRITE) -n colorsprite -m > colorsprite.s
+	$(ASMGEN) -a mac65 -p 6502 -s hgrcolor $(COLORSPRITE) -n colorsprite -m > colorsprite.s
 
 bwtest.dsk: asmgen.py bwtest.s bwsprite.s
 	atasm -obwtest.xex bwtest.s -Lbwtest.var -gbwtest.lst
@@ -27,7 +28,7 @@ colortest.dsk: asmgen.py colortest.s bwsprite.s
 	atrcopy colortest.dsk boot -b colortest.xex --brun 6000 -f
 
 cpbg-asmgen-driver.s: asmgen.py $(BWSPRITE)
-	python asmgen.py -a mac65 -p 6502 -s hgrbw -m -k -d -g -f fatfont128.dat -o cpbg $(BWSPRITE) $(COLORSPRITE)
+	$(ASMGEN) -a mac65 -p 6502 -s hgrbw -m -k -d -g -f fatfont128.dat -o cpbg $(BWSPRITE) $(COLORSPRITE)
 
 cpbg.xex: cpbg.s cpbg-asmgen-driver.s
 	atasm -mae -ocpbg.xex cpbg.s -Lcpbg.var -gcpbg.lst
@@ -36,7 +37,7 @@ cpbg.dsk: asmgen.py cpbg.xex
 	atrcopy cpbg.dsk boot -b cpbg.xex --brun 6000 -f
 
 fonttest-asmgen-driver.s: asmgen.py fatfont128.dat
-	python asmgen.py -a mac65 -p 6502 -s hgrbw -f fatfont128.dat -r -o fonttest
+	$(ASMGEN) -a mac65 -p 6502 -s hgrbw -f fatfont128.dat -r -o fonttest
 
 fonttest.dsk: fonttest.s fatfont.s fonttest-asmgen-driver.s slowfont.s
 	atasm -ofonttest.xex fonttest.s -Lfonttest.var -gfonttest.lst

demo/transposed_fonts/Makefile

@@ -1,6 +1,8 @@
 # Currently valid assemblers: mac65 and cc65
 ASSEMBLER = "mac65"
 
+ASMGEN = python ../../asmgen.py
+
 TARGETS = TEST1A.BIN TEST1B.BIN TEST1C.BIN TEST1D.BIN TEST2.BIN test3--transposed_font.s TEST3.BIN
 
 all: $(TARGETS)
@@ -40,7 +42,7 @@ TEST2.BIN: driver.s test2--compiled_font.s
 	atrcopy asmsgen_font_compare.dsk add $@ -f
 
 test3--transposed_font.s:
-	python ../asmgen.py -a $(ASSEMBLER) -f fatfont128.dat > test3--transposed_font.s
+	$(ASMGEN) -a $(ASSEMBLER) -f fatfont128.dat > test3--transposed_font.s
 
 TEST3.BIN: driver.s test3--transposed_font.s
 	rm -f $@