From 9088f53a9e9ad7a1e8e069bbd7913a64e88b5a3b Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Mon, 7 Mar 2016 20:23:19 +1100 Subject: [PATCH] Update imagecon calls in Makefiles for new usage --- 007.masked_blit/Makefile | 4 ++-- 008.shift_blit/Makefile | 6 +++--- 009.anim_blit/Makefile | 6 +++--- 010.blit_speed/Makefile | 8 ++++---- Makefile | 4 +++- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/007.masked_blit/Makefile b/007.masked_blit/Makefile index 66d97ba..ae103fc 100644 --- a/007.masked_blit/Makefile +++ b/007.masked_blit/Makefile @@ -15,8 +15,8 @@ $(SHARED_PALETTE): $(IMAGEFILE) $(BOB_IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE),$(BOB_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors 32 --quantize --output-palette $(IMAGEDATA): $(IMAGECON) $(IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-palette-asm --use-palette $(SHARED_PALETTE) + $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-palette-asm --use-palette $(SHARED_PALETTE) --colors 32 $(BOB_IMAGEDATA): $(IMAGECON) $(BOB_IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) + $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) --colors 32 $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-mask --quantize --colors 32 diff --git a/008.shift_blit/Makefile b/008.shift_blit/Makefile index 6a3777b..e345501 100644 --- a/008.shift_blit/Makefile +++ b/008.shift_blit/Makefile @@ -15,8 +15,8 @@ $(SHARED_PALETTE): $(IMAGEFILE) $(BOB_IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE),$(BOB_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors 32 --quantize --output-palette $(IMAGEDATA): $(IMAGECON) $(IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-palette-asm --use-palette $(SHARED_PALETTE) + $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-palette-asm --use-palette $(SHARED_PALETTE) --colors 32 $(BOB_IMAGEDATA): $(IMAGECON) $(BOB_IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) - $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-mask --quantize + $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) --colors 32 + $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-mask --quantize --colors 32 diff --git a/009.anim_blit/Makefile b/009.anim_blit/Makefile index cd673f3..a414582 100644 --- a/009.anim_blit/Makefile +++ b/009.anim_blit/Makefile @@ -15,8 +15,8 @@ $(SHARED_PALETTE): $(IMAGEFILE) $(BOB_IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE),$(BOB_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors 32 --quantize --output-palette $(IMAGEDATA): $(IMAGECON) $(IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-palette-asm --use-palette $(SHARED_PALETTE) + $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-palette-asm --use-palette $(SHARED_PALETTE) --colors 32 $(BOB_IMAGEDATA): $(IMAGECON) $(BOB_IMAGEFILE) $(SHARED_PALETTE) - $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) - $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-mask --quantize + $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) --colors 32 + $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-mask --quantize --colors 32 \ No newline at end of file diff --git a/010.blit_speed/Makefile b/010.blit_speed/Makefile index 4092780..136a6ea 100644 --- a/010.blit_speed/Makefile +++ b/010.blit_speed/Makefile @@ -14,11 +14,11 @@ VASM_EXTRA_ARGS=-DSCREEN_COLORS=$(NUM_COLORS) include ../shared/base.mk $(SHARED_PALETTE): $(IMAGEFILE) $(BOB_IMAGEFILE) Makefile - $(IMAGECON) --input $(IMAGEFILE),$(BOB_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors $(NUM_COLORS) --quantize --output-palette + $(IMAGECON) --input $(IMAGEFILE),$(BOB_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors $(NUM_COLORS) --quantize --colors $(NUM_COLORS) --output-palette $(IMAGEDATA): $(IMAGECON) $(IMAGEFILE) $(SHARED_PALETTE) Makefile - $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-grey-palette-asm --output-palette-asm --use-palette $(SHARED_PALETTE) + $(IMAGECON) --input $(IMAGEFILE) --output out/image --output-bitplanes --output-grey-palette-asm --output-palette-asm --use-palette $(SHARED_PALETTE) --colors $(NUM_COLORS) $(BOB_IMAGEDATA): $(IMAGECON) $(BOB_IMAGEFILE) $(SHARED_PALETTE) Makefile - $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) - $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --colors $(NUM_COLORS) --output-mask --quantize + $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-bitplanes --use-palette $(SHARED_PALETTE) --colors $(NUM_COLORS) + $(IMAGECON) --input $(BOB_IMAGEFILE) --output $(BOB_BASE) --output-mask --quantize --colors $(NUM_COLORS) \ No newline at end of file diff --git a/Makefile b/Makefile index adadee4..1fef1c1 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,9 @@ SUBDIRS=tools/makeadf \ 007.masked_blit\ 008.shift_blit\ 009.anim_blit\ - 010.blit_speed + 010.blit_speed\ + 011.ehb_mode\ + 012.ham_mode .PHONY: subdirs $(SUBDIRS)