.map and .noi are generated with .ihx

cpcitor · May 6, 2020 · 1572888 · 1572888
1 parent 14780ff
commit 1572888
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sdcc-project.Makefile b/sdcc-project.Makefile
@@ -269,7 +269,7 @@ $(CDTC_ENV_FOR_PNG2CPCSPRITE):
 # If you don't want this (presumably because you provide your own putchar), include in your cdtc_project.conf "NO_DEFAULT_PUTCHAR = anythingnonempty".
 
 # "--data-loc 0" ensures data area is computed by linker.
-$(PROJNAME).ihx: $(LOCALRELSFORCEDFIRST) $(RELS) Makefile $(CDTC_ENV_FOR_SDCC) cdtc_project.conf $(LDLIBS)
+$(PROJNAME).ihx $(PROJNAME).map $(PROJNAME).noi: $(LOCALRELSFORCEDFIRST) $(RELS) Makefile $(CDTC_ENV_FOR_SDCC) cdtc_project.conf $(LDLIBS)
 	( set -xv ; SDCC_LDFLAGS="--code-loc $$(printf 0x%x $(CODELOC)) --data-loc 0" ; \
 	if [[ -n "$(SRCS)" ]] ; then \
 	if [[ "$(NO_DEFAULT_PUTCHAR)" = "" ]] && grep -H '^#include .stdio.h.' $(SRCS) ; then echo "This executable depends on stdio(putchar): $@" ; $(MAKE) $(CDTC_ENV_FOR_CPC_PUTCHAR) ; SDCC_LDFLAGS="$${SDCC_LDFLAGS} $(CDTC_ROOT)/cpclib/cdtc_stdio/putchar_cpc.rel" ; fi ; \

diff --git a/tool/png2cpcsprite/png2cpcsprite.c b/tool/png2cpcsprite/png2cpcsprite.c
@@ -1189,8 +1189,8 @@ int main(int argc, const char **argv)
                 for (size_t yplain = 0; yplain < image.height; yplain++)
                 {
                         int y = arguments.bottom_to_top
-                                             ? image.height - 1 - yplain
-                                             : yplain;
+                                        ? image.height - 1 - yplain
+                                        : yplain;
                         u_int8_t bytes_on_this_line = 0;
 
                         b = &(sprite_buffer[width_bytes * y]);