Updated to use resize

This commit is contained in:
alpine9000
2016-03-12 12:53:27 +11:00
parent 8d15b06983
commit 3a64d0861f
+9 -5
View File
@@ -1,16 +1,20 @@
MODULE=dithered_ham.s MODULE=dithered_ham.s
FLOPPY=bin/dithered_ham.adf FLOPPY=bin/dithered_ham.adf
IMAGEDATA=out/image-palette.s out/image-ham.bin IMAGEDATA=out/image-palette.s out/image-ham.bin
IMAGEFILE=../assets/gigi_320x256.png IMAGEFILE=../assets/gigi_full.png
#IMAGEFILE=../assets/demo_320x256.png @IMAGEFILE=../assets/demo_full.png
EXTRA=$(IMAGEDATA) $(BOB_IMAGEDATA) init.s utils.s constants.i Makefile EXTRA=$(IMAGEDATA) $(BOB_IMAGEDATA) init.s utils.s constants.i Makefile
SIZED_IMAGEFILE=out/image.png
USE_PALETTE=--use-palette gigi.pal USE_PALETTE=--use-palette gigi.pal
@USE_PALETTE=--use-palette demo.pal #USE_PALETTE=--use-palette demo.pal
#USE_PALETTE=--ham-brute-force #USE_PALETTE=--ham-brute-force
DITHER=--dither DITHER=--dither
include ../shared/base.mk include ../shared/base.mk
$(IMAGEDATA): $(IMAGECON) $(IMAGEFILE) Makefile $(SIZED_IMAGEFILE): $(IMAGEFILE) $(RESIZE) Makefile
$(IMAGECON) --input $(IMAGEFILE) --output out/image --ham --output-bitplanes --output-palette-asm $(USE_PALETTE) --output-palette $(DITHER) $(RESIZE) --width=320 --height=256 --blur=0.75 --input=$(IMAGEFILE) --output=$(SIZED_IMAGEFILE)
$(IMAGEDATA): $(IMAGECON) $(SIZED_IMAGEFILE) Makefile
$(IMAGECON) --input $(SIZED_IMAGEFILE) --output out/image --ham --output-bitplanes --output-palette-asm $(USE_PALETTE) --output-palette $(DITHER)