Don't compress module into assets folder

This commit is contained in:
alpine9000
2016-03-23 14:36:09 +11:00
parent 104ed3f6f1
commit 0019f4af27
2 changed files with 11 additions and 5 deletions
+10 -4
View File
@@ -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
+1 -1
View File
@@ -262,6 +262,6 @@ endImageData8:
cnop 0,512
compressedModule:
incbin "../assets/P61.breath_of_life.lz"
incbin "out/P61.breath_of_life.lz"
endCompressedModule: