diff --git a/Makefile b/demo/sprite_compiler/Makefile similarity index 69% rename from Makefile rename to demo/sprite_compiler/Makefile index 6658b29..afec686 100644 --- a/Makefile +++ b/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 diff --git a/bwtest.s b/demo/sprite_compiler/bwtest.s similarity index 100% rename from bwtest.s rename to demo/sprite_compiler/bwtest.s diff --git a/colortest.s b/demo/sprite_compiler/colortest.s similarity index 100% rename from colortest.s rename to demo/sprite_compiler/colortest.s diff --git a/cpbg.s b/demo/sprite_compiler/cpbg.s similarity index 100% rename from cpbg.s rename to demo/sprite_compiler/cpbg.s diff --git a/drawfont.s b/demo/sprite_compiler/drawfont.s similarity index 100% rename from drawfont.s rename to demo/sprite_compiler/drawfont.s diff --git a/fonttest.s b/demo/sprite_compiler/fonttest.s similarity index 100% rename from fonttest.s rename to demo/sprite_compiler/fonttest.s diff --git a/multitest.s b/demo/sprite_compiler/multitest.s similarity index 100% rename from multitest.s rename to demo/sprite_compiler/multitest.s diff --git a/slowfont.s b/demo/sprite_compiler/slowfont.s similarity index 100% rename from slowfont.s rename to demo/sprite_compiler/slowfont.s diff --git a/transposed_font_comparison/HELLO b/demo/transposed_fonts/HELLO similarity index 100% rename from transposed_font_comparison/HELLO rename to demo/transposed_fonts/HELLO diff --git a/transposed_font_comparison/Makefile b/demo/transposed_fonts/Makefile similarity index 93% rename from transposed_font_comparison/Makefile rename to demo/transposed_fonts/Makefile index dc15b01..c248e26 100644 --- a/transposed_font_comparison/Makefile +++ b/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 $@ diff --git a/transposed_font_comparison/TEST1A.BIN b/demo/transposed_fonts/TEST1A.BIN similarity index 100% rename from transposed_font_comparison/TEST1A.BIN rename to demo/transposed_fonts/TEST1A.BIN diff --git a/transposed_font_comparison/TEST1B.BIN b/demo/transposed_fonts/TEST1B.BIN similarity index 100% rename from transposed_font_comparison/TEST1B.BIN rename to demo/transposed_fonts/TEST1B.BIN diff --git a/transposed_font_comparison/TEST1C.BIN b/demo/transposed_fonts/TEST1C.BIN similarity index 100% rename from transposed_font_comparison/TEST1C.BIN rename to demo/transposed_fonts/TEST1C.BIN diff --git a/transposed_font_comparison/TEST1D.BIN b/demo/transposed_fonts/TEST1D.BIN similarity index 100% rename from transposed_font_comparison/TEST1D.BIN rename to demo/transposed_fonts/TEST1D.BIN diff --git a/transposed_font_comparison/TEST2.BIN b/demo/transposed_fonts/TEST2.BIN similarity index 100% rename from transposed_font_comparison/TEST2.BIN rename to demo/transposed_fonts/TEST2.BIN diff --git a/transposed_font_comparison/TEST3.BIN b/demo/transposed_fonts/TEST3.BIN similarity index 100% rename from transposed_font_comparison/TEST3.BIN rename to demo/transposed_fonts/TEST3.BIN diff --git a/transposed_font_comparison/asmsgen_font_compare.dsk b/demo/transposed_fonts/asmsgen_font_compare.dsk similarity index 100% rename from transposed_font_comparison/asmsgen_font_compare.dsk rename to demo/transposed_fonts/asmsgen_font_compare.dsk diff --git a/transposed_font_comparison/driver.s b/demo/transposed_fonts/driver.s similarity index 100% rename from transposed_font_comparison/driver.s rename to demo/transposed_fonts/driver.s diff --git a/transposed_font_comparison/fatfont128.dat b/demo/transposed_fonts/fatfont128.dat similarity index 100% rename from transposed_font_comparison/fatfont128.dat rename to demo/transposed_fonts/fatfont128.dat diff --git a/transposed_font_comparison/test1a--no_optimization.s b/demo/transposed_fonts/test1a--no_optimization.s similarity index 100% rename from transposed_font_comparison/test1a--no_optimization.s rename to demo/transposed_fonts/test1a--no_optimization.s diff --git a/transposed_font_comparison/test1b--incrementing_font_pointers.s b/demo/transposed_fonts/test1b--incrementing_font_pointers.s similarity index 100% rename from transposed_font_comparison/test1b--incrementing_font_pointers.s rename to demo/transposed_fonts/test1b--incrementing_font_pointers.s diff --git a/transposed_font_comparison/test1c--assembly_lines_ch31.s b/demo/transposed_fonts/test1c--assembly_lines_ch31.s similarity index 100% rename from transposed_font_comparison/test1c--assembly_lines_ch31.s rename to demo/transposed_fonts/test1c--assembly_lines_ch31.s diff --git a/transposed_font_comparison/test1d--self_modifying_code.s b/demo/transposed_fonts/test1d--self_modifying_code.s similarity index 100% rename from transposed_font_comparison/test1d--self_modifying_code.s rename to demo/transposed_fonts/test1d--self_modifying_code.s diff --git a/transposed_font_comparison/test2--compiled_font.s b/demo/transposed_fonts/test2--compiled_font.s similarity index 100% rename from transposed_font_comparison/test2--compiled_font.s rename to demo/transposed_fonts/test2--compiled_font.s diff --git a/transposed_font_comparison/test3--transposed_font.s b/demo/transposed_fonts/test3--transposed_font.s similarity index 100% rename from transposed_font_comparison/test3--transposed_font.s rename to demo/transposed_fonts/test3--transposed_font.s diff --git a/fatfont.s b/fonts/fatfont.s similarity index 100% rename from fatfont.s rename to fonts/fatfont.s diff --git a/fatfont128.dat b/fonts/fatfont128.dat similarity index 100% rename from fatfont128.dat rename to fonts/fatfont128.dat diff --git a/apple-sprite15x15.png b/sprites/apple-sprite15x15.png similarity index 100% rename from apple-sprite15x15.png rename to sprites/apple-sprite15x15.png diff --git a/apple-sprite9x11.png b/sprites/apple-sprite9x11.png similarity index 100% rename from apple-sprite9x11.png rename to sprites/apple-sprite9x11.png diff --git a/moldy_burger.png b/sprites/moldy_burger.png similarity index 100% rename from moldy_burger.png rename to sprites/moldy_burger.png