From f0ca0e4371c35836f54982df3fcc0668f3cd7a58 Mon Sep 17 00:00:00 2001 From: nestornillo <52611892+nestornillo@users.noreply.github.com> Date: Mon, 8 Mar 2021 18:09:46 +0100 Subject: [PATCH 1/3] fixed issue with bin generation in IMG2SP_CONVERT_BIN When converting an image to bin, the '.h.s' file was included into compilation, which generated .lst and .rel that where not deleted with 'make clean' or 'make cleanall' --- cpctelera/cfg/modules/img2sp.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/cpctelera/cfg/modules/img2sp.mk b/cpctelera/cfg/modules/img2sp.mk index 69fe09a26..e2d1f7d90 100644 --- a/cpctelera/cfg/modules/img2sp.mk +++ b/cpctelera/cfg/modules/img2sp.mk @@ -276,7 +276,6 @@ define IMG2SP_CONVERT_BIN # Variables that need to be updated to ensure they are erased on clean IMGBINFILES := $(I2S_B2) $(IMGBINFILES) -IMGASMFILES := $(I2S_S2) $(IMGASMFILES) OBJS2CLEAN := $(I2S_CSB) $(OBJS2CLEAN) endef From dd6cac07390f7867c2e4375a9853a059d8b6662b Mon Sep 17 00:00:00 2001 From: nestornillo <52611892+nestornillo@users.noreply.github.com> Date: Fri, 12 Mar 2021 22:29:22 +0100 Subject: [PATCH 2/3] fixed comment --- cpctelera/cfg/modules/img2sp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpctelera/cfg/modules/img2sp.mk b/cpctelera/cfg/modules/img2sp.mk index e2d1f7d90..1e7b2bc71 100644 --- a/cpctelera/cfg/modules/img2sp.mk +++ b/cpctelera/cfg/modules/img2sp.mk @@ -244,7 +244,7 @@ endef # $(5): C-identifier for the array containing generated palette (if required) # $(6): C-identifier for the array containing generated tileset (ignored: no tileset produced on binary output) # -# Updates IMGCFILES, IMGASMFILES and OBJS2CLEAN adding new C files that result from the pack generation. +# Updates IMGCFILES and OBJS2CLEAN adding new C files that result from the pack generation. # define IMG2SP_CONVERT_BIN # Set up C and H files and paths From 640d0da786ad1075a28c17b6be68b8541953e3b8 Mon Sep 17 00:00:00 2001 From: nestornillo <52611892+nestornillo@users.noreply.github.com> Date: Sat, 26 Jun 2021 23:36:13 +0200 Subject: [PATCH 3/3] Fixed comments --- cpctelera/cfg/modules/img2sp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpctelera/cfg/modules/img2sp.mk b/cpctelera/cfg/modules/img2sp.mk index 1e7b2bc71..85c3d6804 100644 --- a/cpctelera/cfg/modules/img2sp.mk +++ b/cpctelera/cfg/modules/img2sp.mk @@ -244,7 +244,7 @@ endef # $(5): C-identifier for the array containing generated palette (if required) # $(6): C-identifier for the array containing generated tileset (ignored: no tileset produced on binary output) # -# Updates IMGCFILES and OBJS2CLEAN adding new C files that result from the pack generation. +# Updates IMGBINFILES and OBJS2CLEAN adding new C files that result from the pack generation. # define IMG2SP_CONVERT_BIN # Set up C and H files and paths