diff --git a/Makefile b/Makefile index e884707a..1c006005 100644 --- a/Makefile +++ b/Makefile @@ -90,33 +90,33 @@ GEN_KERNAL = # List of build directories -DIR_CUS = build/target_custom -DIR_GEN = build/target_generic -DIR_CRT = build/target_generic_crt -DIR_TST = build/target_testing -DIR_M65 = build/target_mega65 -DIR_U64 = build/target_ultimate64 -DIR_X16 = build/target_cx16 +DIR_CUS = build/target_custom +DIR_GEN = build/target_generic +DIR_GENCRT = build/target_generic_crt +DIR_TST = build/target_testing +DIR_M65 = build/target_mega65 +DIR_U64 = build/target_ultimate64 +DIR_X16 = build/target_cx16 # List of config files -CFG_CUS = src/,,config_custom.s -CFG_GEN = src/,,config_generic.s -CFG_CRT = src/,,config_generic_crt.s -CFG_TST = src/,,config_testing.s -CFG_M65 = src/,,config_mega65.s -CFG_U64 = src/,,config_ultimate64.s -CFG_X16 = src/,,config_cx16.s +CFG_CUS = src/,,config_custom.s +CFG_GEN = src/,,config_generic.s +CFG_GENCRT = src/,,config_generic_crt.s +CFG_TST = src/,,config_testing.s +CFG_M65 = src/,,config_mega65.s +CFG_U64 = src/,,config_ultimate64.s +CFG_X16 = src/,,config_cx16.s # List of files with generated strings -GEN_STR_CUS = $(DIR_CUS)/,generated/,packed_strings.s -GEN_STR_GEN = $(DIR_GEN)/,generated/,packed_strings.s -GEN_STR_CRT = $(DIR_CRT)/,generated/,packed_strings.s -GEN_STR_TST = $(DIR_TST)/,generated/,packed_strings.s -GEN_STR_M65 = $(DIR_M65)/,generated/,packed_strings.s -GEN_STR_U64 = $(DIR_U64)/,generated/,packed_strings.s -GEN_STR_X16 = $(DIR_X16)/,generated/,packed_strings.s +GEN_STR_CUS = $(DIR_CUS)/,generated/,packed_strings.s +GEN_STR_GEN = $(DIR_GEN)/,generated/,packed_strings.s +GEN_STR_GENCRT = $(DIR_GENCRT)/,generated/,packed_strings.s +GEN_STR_TST = $(DIR_TST)/,generated/,packed_strings.s +GEN_STR_M65 = $(DIR_M65)/,generated/,packed_strings.s +GEN_STR_U64 = $(DIR_U64)/,generated/,packed_strings.s +GEN_STR_X16 = $(DIR_X16)/,generated/,packed_strings.s # Dependencies - helper variables @@ -146,58 +146,58 @@ TOOLS_LIST = $(TOOL_GENERATE_CONSTANTS) \ # List of targets -TARGET_CHR_OR = build/chargen_openroms.rom -TARGET_CHR_PXL = build/chargen_pxlfont.rom +TARGET_CHR_ORF = build/chargen_openroms.rom +TARGET_CHR_PXL = build/chargen_pxlfont.rom -TARGET_CUS_B = build/basic_custom.rom -TARGET_GEN_B = build/basic_generic.rom -TARGET_CRT_B = build/basic_generic_crt.rom -TARGET_TST_B = build/basic_testing.rom -TARGET_U64_B = build/basic_ultimate64.rom +TARGET_CUS_B = build/basic_custom.rom +TARGET_GEN_B = build/basic_generic.rom +TARGET_GENCRT_B = build/basic_generic_crt.rom +TARGET_TST_B = build/basic_testing.rom +TARGET_U64_B = build/basic_ultimate64.rom -TARGET_CUS_K = build/kernal_custom.rom -TARGET_GEN_K = build/kernal_generic.rom -TARGET_CRT_K = build/kernal_generic_crt.rom -TARGET_TST_K = build/kernal_testing.rom -TARGET_U64_K = build/kernal_ultimate64.rom +TARGET_CUS_K = build/kernal_custom.rom +TARGET_GEN_K = build/kernal_generic.rom +TARGET_GENCRT_K = build/kernal_generic_crt.rom +TARGET_TST_K = build/kernal_testing.rom +TARGET_U64_K = build/kernal_ultimate64.rom -TARGET_CRT_X = build/external_generic.crt +TARGET_GENCRT_X = build/extrom_generic_crt.crt -TARGET_M65_x = build/mega65.rom -TARGET_M65_x_PXL = build/mega65_pxlfont.rom -TARGET_X16_x = build/cx16-dummy.rom +TARGET_M65_x_ORF = build/mega65.rom +TARGET_M65_x_PXL = build/mega65_pxlfont.rom +TARGET_X16_x = build/cx16-dummy.rom -TARGET_LIST_CUS = $(TARGET_CUS_B) $(TARGET_CUS_K) -TARGET_LIST_GEN = $(TARGET_GEN_B) $(TARGET_GEN_K) -TARGET_LIST_CRT = $(TARGET_CRT_B) $(TARGET_CRT_K) $(TARGET_CRT_X) -TARGET_LIST_TST = $(TARGET_TST_B) $(TARGET_TST_K) -TARGET_LIST_U64 = $(TARGET_U64_B) $(TARGET_U64_K) +TARGET_LIST_CUS = $(TARGET_CUS_B) $(TARGET_CUS_K) +TARGET_LIST_GEN = $(TARGET_GEN_B) $(TARGET_GEN_K) +TARGET_LIST_GENCRT = $(TARGET_GENCRT_B) $(TARGET_GENCRT_K) $(TARGET_GENCRT_X) +TARGET_LIST_TST = $(TARGET_TST_B) $(TARGET_TST_K) +TARGET_LIST_U64 = $(TARGET_U64_B) $(TARGET_U64_K) -TARGET_LIST = build/chargen_openroms.rom \ - $(TARGET_LIST_CUS) \ - $(TARGET_LIST_GEN) \ - $(TARGET_LIST_TST) \ - $(TARGET_LIST_CRT) \ - $(TARGET_M65_x) \ - $(TARGET_M65_x_PXL) \ - $(TARGET_LIST_U64) \ - $(TARGET_X16_x) +TARGET_LIST = build/chargen_openroms.rom \ + $(TARGET_LIST_CUS) \ + $(TARGET_LIST_GEN) \ + $(TARGET_LIST_TST) \ + $(TARGET_LIST_CRT) \ + $(TARGET_M65_x_ORF) \ + $(TARGET_M65_x_PXL) \ + $(TARGET_LIST_U64) \ + $(TARGET_X16_x) -SEG_LIST_CRT = $(DIR_CRT)/basic.seg_1 \ - $(DIR_CRT)/kernal.seg_1 +SEG_LIST_GENCRT = $(DIR_GENCRT)/basic.seg_1 \ + $(DIR_GENCRT)/kernal.seg_1 -SEG_LIST_M65 = $(DIR_M65)/basic.seg_0 \ - $(DIR_M65)/basic.seg_1 \ - $(DIR_M65)/dos.seg_1 \ - $(DIR_M65)/kernal.seg_0 \ - $(DIR_M65)/kernal.seg_1 +SEG_LIST_M65 = $(DIR_M65)/basic.seg_0 \ + $(DIR_M65)/basic.seg_1 \ + $(DIR_M65)/dos.seg_1 \ + $(DIR_M65)/kernal.seg_0 \ + $(DIR_M65)/kernal.seg_1 -SEG_LIST_X16 = $(DIR_X16)/basic.seg_0 \ - $(DIR_X16)/basic.seg_1 \ - $(DIR_X16)/kernal.seg_0 \ - $(DIR_X16)/kernal.seg_1 +SEG_LIST_X16 = $(DIR_X16)/basic.seg_0 \ + $(DIR_X16)/basic.seg_1 \ + $(DIR_X16)/kernal.seg_0 \ + $(DIR_X16)/kernal.seg_1 -REL_TARGET_LIST = $(TARGET_LIST_GEN) $(TARGET_LIST_CRT) $(TARGET_M65_x) $(TARGET_M65_x_PXL) $(TARGET_LIST_U64) +REL_TARGET_LIST = $(TARGET_LIST_GEN) $(TARGET_LIST_GENCRT) $(TARGET_M65_x_ORF) $(TARGET_M65_x_PXL) $(TARGET_LIST_U64) # Misc strings @@ -273,14 +273,14 @@ build/tools/%: tools/%.cc tools/common.h # Rules - CHARGEN -$(TARGET_CHR_OR): $(TOOL_PNGPREPARE) assets/8x8font.png +$(TARGET_CHR_ORF): $(TOOL_PNGPREPARE) assets/8x8font.png @$(TOOL_PNGPREPARE) charrom assets/8x8font.png $@ 1>build/pngprepare.log $(TARGET_CHR_PXL): bin/chargen_pxlfont_2.3.rom @cp $< $@ -build/chargen_openroms.patched: $(TOOL_PATCH_CHARGEN) $(TARGET_CHR_OR) - @$(TOOL_PATCH_CHARGEN) -i $(TARGET_CHR_OR) -o $@ -n 7px-OpenROMs +build/chargen_openroms.patched: $(TOOL_PATCH_CHARGEN) $(TARGET_CHR_ORF) + @$(TOOL_PATCH_CHARGEN) -i $(TARGET_CHR_ORF) -o $@ -n 7px-OpenROMs build/chargen_pxlfont.patched: $(TOOL_PATCH_CHARGEN) $(TARGET_CHR_PXL) @$(TOOL_PATCH_CHARGEN) -i $(TARGET_CHR_PXL) -o $@ -n 6px-PXLfont @@ -305,10 +305,10 @@ $(DIR_TST)/OUTK_x.BIN $(DIR_TST)/KERNAL_combined.vs $(DIR_TST)/KERNAL_combined.s $(DIR_U64)/OUTK_x.BIN $(DIR_U64)/KERNAL_combined.vs $(DIR_U64)/KERNAL_combined.sym: \ $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_KERNAL) $(CFG_U64) $(GEN_STR_U64) -$(DIR_CRT)/OUTB_0.BIN $(DIR_CRT)/BASIC_0_combined.vs: \ - $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_BASIC) $(CFG_CRT) $(CRT_STR_CRT) $(DIR_CRT)/KERNAL_0_combined.sym -$(DIR_CRT)/OUTK_0.BIN $(DIR_CRT)/KERNAL_0_combined.vs $(DIR_CRT)/KERNAL_0_combined.sym: \ - $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_KERNAL) $(CFG_CRT) $(GEN_STR_CRT) +$(DIR_GENCRT)/OUTB_0.BIN $(DIR_GENCRT)/BASIC_0_combined.vs: \ + $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_BASIC) $(CFG_GENCRT) $(CRT_STR_GENCRT) $(DIR_GENCRT)/KERNAL_0_combined.sym +$(DIR_GENCRT)/OUTK_0.BIN $(DIR_GENCRT)/KERNAL_0_combined.vs $(DIR_GENCRT)/KERNAL_0_combined.sym: \ + $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_KERNAL) $(CFG_GENCRT) $(GEN_STR_GENCRT) $(DIR_M65)/OUTB_0.BIN $(DIR_M65)/BASIC_0_combined.vs $(DIR_M65)/BASIC_0_combined.sym: \ $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_BASIC) $(CFG_M65) $(GEN_STR_M65) $(DIR_M65)/KERNAL_0_combined.sym @@ -320,10 +320,10 @@ $(DIR_X16)/OUTB_0.BIN $(DIR_X16)/BASIC_0_combined.vs $(DIR_X16)/BASIC_0_combine $(DIR_X16)/OUTK_0.BIN $(DIR_X16)/KERNAL_0_combined.vs $(DIR_X16)/KERNAL_0_combined.sym: \ $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_KERNAL) $(CFG_X16) $(GEN_STR_X16) -$(DIR_CRT)/basic.seg_1 $(DIR_CRT)/BASIC_1_combined.vs $(DIR_CRT)/BASIC_1_combined.sym: \ - $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_BASIC) $(CFG_CRT) $(GEN_STR_CRT) $(DIR_CRT)/KERNAL_0_combined.sym $(DIR_CRT)/BASIC_0_combined.sym -$(DIR_CRT)/kernal.seg_1 $(DIR_CRT)/KERNAL_1_combined.vs $(DIR_CRT)/KERNAL_1_combined.sym: \ - $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_KERNAL) $(CFG_CRT) $(GEN_STR_CRT) $(DIR_CRT)/KERNAL_0_combined.sym +$(DIR_GENCRT)/basic.seg_1 $(DIR_GENCRT)/BASIC_1_combined.vs $(DIR_GENCRT)/BASIC_1_combined.sym: \ + $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_BASIC) $(CFG_GENCRT) $(GEN_STR_GENCRT) $(DIR_GENCRT)/KERNAL_0_combined.sym $(DIR_GENCRT)/BASIC_0_combined.sym +$(DIR_GENCRT)/kernal.seg_1 $(DIR_GENCRT)/KERNAL_1_combined.vs $(DIR_GENCRT)/KERNAL_1_combined.sym: \ + $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_KERNAL) $(CFG_GENCRT) $(GEN_STR_GENCRT) $(DIR_GENCRT)/KERNAL_0_combined.sym $(DIR_M65)/basic.seg_1 $(DIR_M65)/BASIC_1_combined.vs $(DIR_M65)/BASIC_1_combined.sym: \ $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_BASIC) $(CFG_M65) $(GEN_STR_M65) $(DIR_M65)/KERNAL_0_combined.sym $(DIR_M65)/BASIC_0_combined.sym @@ -337,13 +337,13 @@ $(DIR_X16)/basic.seg_1 $(DIR_X16)/BASIC_1_combined.vs $(DIR_X16)/BASIC_1_combi $(DIR_X16)/kernal.seg_1 $(DIR_X16)/KERNAL_1_combined.vs $(DIR_X16)/KERNAL_1_combined.sym: \ $(TOOL_ASSEMBLER) $(TOOL_BUILD_SEGMENT) $(DEP_KERNAL) $(CFG_X16) $(GEN_STR_X16) $(DIR_X16)/KERNAL_0_combined.sym -$(DIR_CUS)/OUTx_x.BIN: $(DIR_CUS)/OUTB_x.BIN $(DIR_CUS)/OUTK_x.BIN -$(DIR_GEN)/OUTx_x.BIN: $(DIR_GEN)/OUTB_x.BIN $(DIR_GEN)/OUTK_x.BIN -$(DIR_CRT)/OUTx_0.BIN: $(DIR_CRT)/OUTB_0.BIN $(DIR_CRT)/OUTK_0.BIN -$(DIR_TST)/OUTx_x.BIN: $(DIR_TST)/OUTB_x.BIN $(DIR_TST)/OUTK_x.BIN -$(DIR_M65)/OUTx_0.BIN: $(DIR_M65)/OUTB_0.BIN $(DIR_M65)/OUTK_0.BIN -$(DIR_U64)/OUTx_x.BIN: $(DIR_U64)/OUTB_x.BIN $(DIR_U64)/OUTK_x.BIN -$(DIR_X16)/OUTx_0.BIN: $(DIR_X16)/OUTB_0.BIN $(DIR_X16)/OUTK_0.BIN +$(DIR_CUS)/OUTx_x.BIN: $(DIR_CUS)/OUTB_x.BIN $(DIR_CUS)/OUTK_x.BIN +$(DIR_GEN)/OUTx_x.BIN: $(DIR_GEN)/OUTB_x.BIN $(DIR_GEN)/OUTK_x.BIN +$(DIR_GENCRT)/OUTx_0.BIN: $(DIR_GENCRT)/OUTB_0.BIN $(DIR_GENCRT)/OUTK_0.BIN +$(DIR_TST)/OUTx_x.BIN: $(DIR_TST)/OUTB_x.BIN $(DIR_TST)/OUTK_x.BIN +$(DIR_M65)/OUTx_0.BIN: $(DIR_M65)/OUTB_0.BIN $(DIR_M65)/OUTK_0.BIN +$(DIR_U64)/OUTx_x.BIN: $(DIR_U64)/OUTB_x.BIN $(DIR_U64)/OUTK_x.BIN +$(DIR_X16)/OUTx_0.BIN: $(DIR_X16)/OUTB_0.BIN $(DIR_X16)/OUTK_0.BIN $(TARGET_CUS_B): $(DIR_CUS)/OUTx_x.BIN $(TARGET_GEN_B): $(DIR_GEN)/OUTx_x.BIN @@ -355,11 +355,11 @@ $(TARGET_GEN_K): $(DIR_GEN)/OUTx_x.BIN $(TARGET_TST_K): $(DIR_TST)/OUTx_x.BIN $(TARGET_U64_K): $(DIR_U64)/OUTx_x.BIN -build/symbols_custom.vs: $(DIR_CUS)/BASIC_combined.vs $(DIR_CUS)/KERNAL_combined.vs -build/symbols_generic.vs: $(DIR_GEN)/BASIC_combined.vs $(DIR_GEN)/KERNAL_combined.vs -build/symbols_generic_crt.vs: $(DIR_CRT)/BASIC_0_combined.vs $(DIR_CRT)/KERNAL_0_combined.vs -build/symbols_testing.vs: $(DIR_TST)/BASIC_combined.vs $(DIR_TST)/KERNAL_combined.vs -build/symbols_ultimate64.vs: $(DIR_U64)/BASIC_combined.vs $(DIR_U64)/KERNAL_combined.vs +build/symbols_custom.vs: $(DIR_CUS)/BASIC_combined.vs $(DIR_CUS)/KERNAL_combined.vs +build/symbols_generic.vs: $(DIR_GEN)/BASIC_combined.vs $(DIR_GEN)/KERNAL_combined.vs +build/symbols_generic_crt.vs: $(DIR_GENCRT)/BASIC_0_combined.vs $(DIR_GENCRT)/KERNAL_0_combined.vs +build/symbols_testing.vs: $(DIR_TST)/BASIC_combined.vs $(DIR_TST)/KERNAL_combined.vs +build/symbols_ultimate64.vs: $(DIR_U64)/BASIC_combined.vs $(DIR_U64)/KERNAL_combined.vs # Rules - BASIC and KERNAL intermediate files @@ -371,9 +371,9 @@ $(GEN_STR_GEN): $(TOOL_GENERATE_STRINGS) $(CFG_GEN) @mkdir -p $(DIR_GEN)/,generated $(TOOL_GENERATE_STRINGS) -o $@ -c $(CFG_GEN) -$(GEN_STR_CRT): $(TOOL_GENERATE_STRINGS) $(CFG_CRT) - @mkdir -p $(DIR_CRT)/,generated - $(TOOL_GENERATE_STRINGS) -o $@ -c $(CFG_CRT) +$(GEN_STR_GENCRT): $(TOOL_GENERATE_STRINGS) $(CFG_GENCRT) + @mkdir -p $(DIR_GENCRT)/,generated + $(TOOL_GENERATE_STRINGS) -o $@ -c $(CFG_GENCRT) $(GEN_STR_TST): $(TOOL_GENERATE_STRINGS) $(CFG_TST) @mkdir -p $(DIR_TST)/,generated @@ -397,7 +397,7 @@ build/,generated/,float_constants.s: $(TOOL_GENERATE_CONSTANTS) GEN_STR_custom = $(GEN_STR_CUS) GEN_STR_generic = $(GEN_STR_GEN) -GEN_STR_generic_crt = $(GEN_STR_CRT) +GEN_STR_generic_crt = $(GEN_STR_GENCRT) GEN_STR_testing = $(GEN_STR_TST) GEN_STR_mega65 = $(GEN_STR_M65) GEN_STR_ultimate64 = $(GEN_STR_U64) @@ -417,25 +417,25 @@ build/target_%/OUTK_x.BIN build/target_%/KERNAL_combined.vs build/target_%/KERNA # Rules - BASIC and KERNAL intermediate files, for ROM with external cartridge -$(DIR_CRT)/OUTB_0.BIN $(DIR_CRT)/BASIC_0_combined.vs $(DIR_CRT)/BASIC_0_combined.sym: - @mkdir -p $(DIR_CRT) - @rm -f $@* $(DIR_CRT)/BASIC_0* - @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s BASIC_0 -i BASIC_0-generic-crt -o OUTB_0.BIN -d $(DIR_CRT) -l a000 -h e4d2 $(CFG_CRT) $(GEN_STR_CRT) $(SRCDIR_BASIC) $(GEN_BASIC) +$(DIR_GENCRT)/OUTB_0.BIN $(DIR_GENCRT)/BASIC_0_combined.vs $(DIR_GENCRT)/BASIC_0_combined.sym: + @mkdir -p $(DIR_GENCRT) + @rm -f $@* $(DIR_GENCRT)/BASIC_0* + @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s BASIC_0 -i BASIC_0-generic-crt -o OUTB_0.BIN -d $(DIR_GENCRT) -l a000 -h e4d2 $(CFG_GENCRT) $(GEN_STR_GENCRT) $(SRCDIR_BASIC) $(GEN_BASIC) -$(DIR_CRT)/OUTK_0.BIN $(DIR_CRT)/KERNAL_0_combined.vs $(DIR_CRT)/KERNAL_0_combined.sym: - @mkdir -p $(DIR_CRT) - @rm -f $@* $(DIR_CRT)/KERNAL_0* - @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s KERNAL_0 -i KERNAL_0-generic-crt -o OUTK_0.BIN -d $(DIR_CRT) -l e4d3 -h ffff $(CFG_CRT) $(GEN_STR_CRT) $(SRCDIR_KERNAL) $(GEN_KERNAL) +$(DIR_GENCRT)/OUTK_0.BIN $(DIR_GENCRT)/KERNAL_0_combined.vs $(DIR_GENCRT)/KERNAL_0_combined.sym: + @mkdir -p $(DIR_GENCRT) + @rm -f $@* $(DIR_GENCRT)/KERNAL_0* + @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s KERNAL_0 -i KERNAL_0-generic-crt -o OUTK_0.BIN -d $(DIR_GENCRT) -l e4d3 -h ffff $(CFG_GENCRT) $(GEN_STR_GENCRT) $(SRCDIR_KERNAL) $(GEN_KERNAL) -$(DIR_CRT)/basic.seg_1 $(DIR_CRT)/BASIC_1_combined.vs $(DIR_CRT)/BASIC_1_combined.sym: - @mkdir -p $(DIR_CRT) - @rm -f $@* $(DIR_CRT)/basic.seg_1 $(DIR_CRT)/BASIC_1* - @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s BASIC_1 -i BASIC_1-generic-crt -o basic.seg_1 -d $(DIR_CRT) -l 8000 -h 9fff $(CFG_CRT) $(GEN_STR_CRT) $(SRCDIR_BASIC) $(GEN_BASIC) +$(DIR_GENCRT)/basic.seg_1 $(DIR_GENCRT)/BASIC_1_combined.vs $(DIR_GENCRT)/BASIC_1_combined.sym: + @mkdir -p $(DIR_GENCRT) + @rm -f $@* $(DIR_GENCRT)/basic.seg_1 $(DIR_GENCRT)/BASIC_1* + @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s BASIC_1 -i BASIC_1-generic-crt -o basic.seg_1 -d $(DIR_GENCRT) -l 8000 -h 9fff $(CFG_GENCRT) $(GEN_STR_GENCRT) $(SRCDIR_BASIC) $(GEN_BASIC) -$(DIR_CRT)/kernal.seg_1 $(DIR_CRT)/KERNAL_1_combined.vs $(DIR_CRT)/KERNAL_1_combined.sym: - @mkdir -p $(DIR_CRT) - @rm -f $@* $(DIR_CRT)/kernal.seg_1 $(DIR_CRT)/KERNAL_1* - @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s KERNAL_1 -i KERNAL_1-generic-crt -o kernal.seg_1 -d $(DIR_CRT) -l 8000 -h 9fff $(CFG_CRT) $(GEN_STR_CRT) $(SRCDIR_KERNAL) $(GEN_KERNAL) +$(DIR_GENCRT)/kernal.seg_1 $(DIR_GENCRT)/KERNAL_1_combined.vs $(DIR_GENCRT)/KERNAL_1_combined.sym: + @mkdir -p $(DIR_GENCRT) + @rm -f $@* $(DIR_GENCRT)/kernal.seg_1 $(DIR_GENCRT)/KERNAL_1* + @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r CRT -s KERNAL_1 -i KERNAL_1-generic-crt -o kernal.seg_1 -d $(DIR_GENCRT) -l 8000 -h 9fff $(CFG_GENCRT) $(GEN_STR_GENCRT) $(SRCDIR_KERNAL) $(GEN_KERNAL) # Rules - BASIC and KERNAL intermediate files, for MEGA65 @@ -504,14 +504,14 @@ build/basic_%.rom: build/symbols_%.vs: @sort build/target_$*/BASIC_combined.vs build/target_$*/KERNAL_combined.vs | uniq | grep -v "__" > $@ -$(DIR_CRT)/OUTx_0.BIN: - @cat $(DIR_CRT)/OUTB_0.BIN $(DIR_CRT)/OUTK_0.BIN > $@ +$(DIR_GENCRT)/OUTx_0.BIN: + @cat $(DIR_GENCRT)/OUTB_0.BIN $(DIR_GENCRT)/OUTK_0.BIN > $@ -$(DIR_CRT)/kernal.seg_0: $(DIR_CRT)/OUTx_0.BIN - @dd if=$(DIR_CRT)/OUTx_0.BIN bs=8192 count=1 skip=2 of=$@ status=none +$(DIR_GENCRT)/kernal.seg_0: $(DIR_GENCRT)/OUTx_0.BIN + @dd if=$(DIR_GENCRT)/OUTx_0.BIN bs=8192 count=1 skip=2 of=$@ status=none -$(DIR_CRT)/basic.seg_0: $(DIR_CRT)/OUTx_0.BIN - @dd if=$(DIR_CRT)/OUTx_0.BIN bs=8192 count=1 skip=0 of=$@ status=none +$(DIR_GENCRT)/basic.seg_0: $(DIR_GENCRT)/OUTx_0.BIN + @dd if=$(DIR_GENCRT)/OUTx_0.BIN bs=8192 count=1 skip=0 of=$@ status=none $(DIR_M65)/OUTx_0.BIN: @cat $(DIR_M65)/OUTB_0.BIN $(DIR_M65)/OUTK_0.BIN > $@ @@ -531,14 +531,14 @@ $(DIR_X16)/kernal.seg_0: $(DIR_X16)/OUTx_0.BIN $(DIR_X16)/basic.seg_0: $(DIR_X16)/OUTx_0.BIN @dd if=$(DIR_X16)/OUTx_0.BIN bs=8192 count=1 skip=0 of=$@ status=none -$(TARGET_CRT_K): $(DIR_CRT)/OUTx_0.BIN - @dd if=$(DIR_CRT)/OUTx_0.BIN bs=8192 count=1 skip=2 of=$@ status=none +$(TARGET_GENCRT_K): $(DIR_GENCRT)/OUTx_0.BIN + @dd if=$(DIR_GENCRT)/OUTx_0.BIN bs=8192 count=1 skip=2 of=$@ status=none -$(TARGET_CRT_B): $(DIR_CRT)/OUTx_0.BIN - @dd if=$(DIR_CRT)/OUTx_0.BIN bs=8192 count=1 skip=0 of=$@ status=none +$(TARGET_GENCRT_B): $(DIR_GENCRT)/OUTx_0.BIN + @dd if=$(DIR_GENCRT)/OUTx_0.BIN bs=8192 count=1 skip=0 of=$@ status=none build/symbols_generic_crt.vs: - @sort $(DIR_CRT)/BASIC_0_combined.vs $(DIR_CRT)/KERNAL_0_combined.vs | uniq | grep -v "__" > $@ + @sort $(DIR_GENCRT)/BASIC_0_combined.vs $(DIR_GENCRT)/KERNAL_0_combined.vs | uniq | grep -v "__" > $@ build/kernal_hybrid.rom: kernal $(DIR_GEN)/OUTK_x.BIN @echo @@ -570,7 +570,7 @@ build/padding_8_KB: @mkdir -p build @dd if=/dev/zero bs=8192 count=1 of=$@ status=none -$(TARGET_CRT_X): $(SEG_LIST_CRT) $(CRT_HDR_LIST) build/padding_8_KB +$(TARGET_GENCRT_X): $(SEG_LIST_GENCRT) $(CRT_HDR_LIST) build/padding_8_KB @echo @echo @echo @@ -579,11 +579,11 @@ $(TARGET_CRT_X): $(SEG_LIST_CRT) $(CRT_HDR_LIST) build/padding_8_KB @echo //------------------------------------------------------------------------------------------- @cat assets/cartridge/header-cart.bin > $@ @cat assets/cartridge/header-seg0.bin >> $@ - @cat $(DIR_CRT)/basic.seg_1 >> $@ + @cat $(DIR_GENCRT)/basic.seg_1 >> $@ @cat assets/cartridge/header-seg1.bin >> $@ @cat build/padding_8_KB >> $@ @cat assets/cartridge/header-seg2.bin >> $@ - @cat $(DIR_CRT)/kernal.seg_1 >> $@ + @cat $(DIR_GENCRT)/kernal.seg_1 >> $@ @cat assets/cartridge/header-seg3.bin >> $@ @cat build/padding_8_KB >> $@ @echo @@ -594,35 +594,35 @@ build/padding_64_KB: @mkdir -p build @dd if=/dev/zero bs=8192 count=8 of=$@ status=none -$(TARGET_M65_x) $(TARGET_M65_x_PXL): $(SEG_LIST_M65) build/padding_64_KB $(TARGET_CHR_OR) build/chargen_openroms.patched $(TARGET_CHR_PXL) build/chargen_pxlfont.patched +$(TARGET_M65_x_ORF) $(TARGET_M65_x_PXL): $(SEG_LIST_M65) build/padding_64_KB $(TARGET_CHR_ORF) build/chargen_openroms.patched $(TARGET_CHR_PXL) build/chargen_pxlfont.patched @echo @echo @echo @echo //------------------------------------------------------------------------------------------- @echo // Making ROM image for MEGA65 - with Open ROMs chargen @echo //------------------------------------------------------------------------------------------- - @cat $(DIR_M65)/dos.seg_1 > $(TARGET_M65_x) - @cat $(DIR_M65)/kernal.seg_1 >> $(TARGET_M65_x) - @cat $(DIR_M65)/basic.seg_1 >> $(TARGET_M65_x) - @cat $(DIR_M65)/basic.seg_0 >> $(TARGET_M65_x) - @cat $(TARGET_CHR_OR) >> $(TARGET_M65_x) - @cat build/chargen_openroms.patched >> $(TARGET_M65_x) - @cat $(DIR_M65)/kernal.seg_0 >> $(TARGET_M65_x) - @cat build/padding_64_KB >> $(TARGET_M65_x) + @cat $(DIR_M65)/dos.seg_1 > $(TARGET_M65_x_ORF) + @cat $(DIR_M65)/kernal.seg_1 >> $(TARGET_M65_x_ORF) + @cat $(DIR_M65)/basic.seg_1 >> $(TARGET_M65_x_ORF) + @cat $(DIR_M65)/basic.seg_0 >> $(TARGET_M65_x_ORF) + @cat $(TARGET_CHR_ORF) >> $(TARGET_M65_x_ORF) + @cat build/chargen_openroms.patched >> $(TARGET_M65_x_ORF) + @cat $(DIR_M65)/kernal.seg_0 >> $(TARGET_M65_x_ORF) + @cat build/padding_64_KB >> $(TARGET_M65_x_ORF) @echo @echo @echo @echo //------------------------------------------------------------------------------------------- @echo // Making ROM image for MEGA65 - with PXL font chargen @echo //------------------------------------------------------------------------------------------- - @cat $(DIR_M65)/dos.seg_1 > $(TARGET_M65_x_PXL) - @cat $(DIR_M65)/kernal.seg_1 >> $(TARGET_M65_x_PXL) - @cat $(DIR_M65)/basic.seg_1 >> $(TARGET_M65_x_PXL) - @cat $(DIR_M65)/basic.seg_0 >> $(TARGET_M65_x_PXL) - @cat $(TARGET_CHR_PXL) >> $(TARGET_M65_x_PXL) - @cat build/chargen_pxlfont.patched >> $(TARGET_M65_x_PXL) - @cat $(DIR_M65)/kernal.seg_0 >> $(TARGET_M65_x_PXL) - @cat build/padding_64_KB >> $(TARGET_M65_x_PXL) + @cat $(DIR_M65)/dos.seg_1 > $(TARGET_M65_x_PXL) + @cat $(DIR_M65)/kernal.seg_1 >> $(TARGET_M65_x_PXL) + @cat $(DIR_M65)/basic.seg_1 >> $(TARGET_M65_x_PXL) + @cat $(DIR_M65)/basic.seg_0 >> $(TARGET_M65_x_PXL) + @cat $(TARGET_CHR_PXL) >> $(TARGET_M65_x_PXL) + @cat build/chargen_pxlfont.patched >> $(TARGET_M65_x_PXL) + @cat $(DIR_M65)/kernal.seg_0 >> $(TARGET_M65_x_PXL) + @cat build/padding_64_KB >> $(TARGET_M65_x_PXL) @echo # Rules - platform 'Commander X16' specific @@ -659,8 +659,8 @@ test_generic: $(TARGET_LIST_GEN)$(TARGET_CHR_PXL) build/symbols_generic.vs test_generic_x128: $(TARGET_LIST_GEN) $(TARGET_CHR_PXL) build/symbols_generic.vs x128 -go64 -kernal64 $(TARGET_GEN_K) -basic64 $(TARGET_GEN_B) -chargen $(TARGET_CHR_PXL) -moncommands build/symbols_generic.vs -1 $(TESTTAPE) -8 $(TESTDISK) -test_generic_crt: $(TARGET_LIST_CRT) $(TARGET_CHR_PXL) build/symbols_generic_crt.vs - x64 -kernal $(TARGET_CRT_K) -basic $(TARGET_CRT_B) -chargen $(TARGET_CHR_PXL) -cartcrt $(TARGET_CRT_X) -moncommands build/symbols_generic_crt.vs -1 $(TESTTAPE) -8 $(TESTDISK) +test_generic_crt: $(TARGET_LIST_GENCRT) $(TARGET_CHR_PXL) build/symbols_generic_crt.vs + x64 -kernal $(TARGET_GENCRT_K) -basic $(TARGET_GENCRT_B) -chargen $(TARGET_CHR_PXL) -cartcrt $(TARGET_GENCRT_X) -moncommands build/symbols_generic_crt.vs -1 $(TESTTAPE) -8 $(TESTDISK) test_testing: $(TARGET_LIST_TST) $(TARGET_CHR_PXL) build/symbols_testing.vs x64 -kernal $(TARGET_TST_K) -basic $(TARGET_TST_B) -chargen $(TARGET_CHR_PXL) -moncommands build/symbols_testing.vs -1 $(TESTTAPE) -8 $(TESTDISK) @@ -668,7 +668,7 @@ test_testing: $(TARGET_LIST_TST) $(TARGET_CHR_PXL) build/symbols_testing.vs test_ultimate64: $(TARGET_LIST_U64) $(TARGET_CHR_PXL) build/symbols_ultimate64.vs x64 -kernal $(TARGET_U64_K) -basic $(TARGET_U64_B) -chargen $(TARGET_CHR_PXL) -moncommands build/symbols_ultimate64.vs -1 $(TESTTAPE) -8 $(TESTDISK) -test_mega65: $(TARGET_M65_x) $(TARGET_M65_x_PXL) +test_mega65: $(TARGET_M65_x_ORF) $(TARGET_M65_x_PXL) ../xemu/build/bin/xmega65.native -dmarev 2 -besure -fontrefresh -forcerom -loadrom $(TARGET_M65_x_PXL) test_cx16: $(TARGET_X16_x)