rename output of additional files

yeastplume · Sep 26, 2021 · 843d022 · 843d022
1 parent 92ae4f6
commit 843d022
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/samples/vic/vic_mcbmp/Makefile b/samples/vic/vic_mcbmp/Makefile
@@ -3,8 +3,8 @@ NAME = p128
 
 project.av: p128-ref-template.png
 	$(ALOEVERA) create project project.av
-	$(ALOEVERA) -p project.av palette import cbm_palette p128-ref-template-short.png
-	$(ALOEVERA) -p project.av imageset import -k test_set_1 4 8 p128-ref-template-short.png
+	$(ALOEVERA) -p project.av palette import cbm_palette p128-temp-tileset-fixed-export.png
+	$(ALOEVERA) -p project.av imageset import -k test_set_1 4 8 p128-temp-tileset-fixed-export.png
 	$(ALOEVERA) -p project.av imageset format -v test_set_1 cbm_palette 4
 	$(ALOEVERA) -p project.av asm -f ca65 ./output/ all
 	$(ALOEVERA) -p project.av asm -f bin ./output/ all

diff --git a/src/cmd/asm/command.rs b/src/cmd/asm/command.rs
@@ -57,15 +57,15 @@ where
 			if code.has_alt_data() {
 				let (file_name, bin_address) = match sel_args.clone() {
 					Some(s) => (s.out_file.clone(), s.bin_address.clone()),
-					None => (format!("{}/{}.alt.bin", asm_args.out_dir, v.id()), [0, 0]),
+					None => (format!("{}/{}.add.bin", asm_args.out_dir, v.id()), [0, 0]),
 				};
 				common::output_to_file(
 					&file_name,
 					&code.data_as_bin(Some(bin_address), false, true)?,
 					&asm_args.sd_image,
 				)?;
 			}
-			(asm_meta.to_string(None)?, None, "meta", "alt.meta")
+			(asm_meta.to_string(None)?, None, "meta", "add.meta")
 		} else {
 			let asm_data = code.assemble_data(asm_args.format.clone(), conflate, false)?;
 			let data_lc = asm_data.line_count();
@@ -77,7 +77,7 @@ where
 			);
 			*line_start += meta_lc + data_lc;
 			let mut ext = "inc";
-			let mut alt_ext = "alt.inc";
+			let mut alt_ext = "add.inc";
 			if asm_args.format == AsmFormat::Cc65 {
 				ext = "h"
 			}
@@ -93,7 +93,7 @@ where
 				));
 				*line_start += meta_lc + data_lc;
 				if asm_args.format == AsmFormat::Cc65 {
-					alt_ext = "alt.h"
+					alt_ext = "add.h"
 				}
 			}
 			(res, alt_res, ext, alt_ext)