diff --git a/023.slideshow/Makefile b/023.slideshow/Makefile index 35b5d13..ca52327 100644 --- a/023.slideshow/Makefile +++ b/023.slideshow/Makefile @@ -4,8 +4,10 @@ SECONDS_WAIT=10 INTERLACE=1 HAM_MODE=1 -BOOTBLOCK_ASM=alpine_bootblock.s +USERSTACK_ADDRESS=7fffc # userstack used by bootblock +BASE_ADDRESS=10000 # if you change this you must also change link.script +BOOTBLOCK_ASM=alpine_bootblock.s OBJS=out/init.o out/utils.o out/trackloader.o out/image.o out/blitter.o ifeq ($(INTERLACE),0) @@ -13,8 +15,8 @@ NOINTERLACE_EXTRA=mr8.png endif IMAGES=mr.png mr2.png mr3.png mr4.png mr6.png mr9.png mr10.png $(NOINTERLACE_EXTRA) -USERSTACK_ADDRESS=7fffc # userstack used by bootblock -BASE_ADDRESS=10000 # if you change this you must also change link.script + +P61MODULE=out/P61.breath_of_life.lz USE_PALETTES=--use-palette=palettes/$*.pal @@ -41,6 +43,7 @@ endif LINK_COMMANDLINE=vlink -T link.script -brawbin1 $< $(OBJS) $(SYMBOL_INFO) -o $@ include ../shared/base.mk + out/%.sized.png: ../assets/%.png $(RESIZE) --width=320 $(FLAGS) --blur=0.75 --input=$< --output=$@ @@ -50,8 +53,11 @@ out/%.bin: out/%.sized.png out/%.lz: out/%.bin $(DOYNAMITE68K) $< +out/%.lz: ../assets/%.mod + $(DOYNAMITE68K) -o $@ $< + out/%-ham.bin: out/%.sized.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --output-bitplanes --output-palette-asm --output-palette $(DITHER) --output out/$* -out/main.o: $(SIZEDIMAGEDATA) $(IMAGEDATA) $(SHRUNKDATA) constants.i Makefile link.script +out/main.o: $(P61MODULE) $(SIZEDIMAGEDATA) $(IMAGEDATA) $(SHRUNKDATA) constants.i Makefile link.script out/init.o: constants.i Makefile \ No newline at end of file diff --git a/023.slideshow/image.s b/023.slideshow/image.s index 456810d..23c4738 100644 --- a/023.slideshow/image.s +++ b/023.slideshow/image.s @@ -262,6 +262,6 @@ endImageData8: cnop 0,512 compressedModule: - incbin "../assets/P61.breath_of_life.lz" + incbin "out/P61.breath_of_life.lz" endCompressedModule: