From bdce9e6b572c3a89fa2ea2571adca243dba64a9c Mon Sep 17 00:00:00 2001 From: Daveo Date: Wed, 10 Jan 2001 17:21:59 +0000 Subject: [PATCH] --- build/globals.mak | 3 ++- makefile.gfx | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/build/globals.mak b/build/globals.mak index 563b90c6d..d21fbd74a 100644 --- a/build/globals.mak +++ b/build/globals.mak @@ -80,7 +80,8 @@ DATA_TOOL_DIR := $(TOOL_DIR)/data DATA_BIN_DIR := $(DATA_TOOL_DIR)/bin DATA_INC_DIR := $(DATA_TOOL_DIR)/include -MKLEVEL := $(DATA_BIN_DIR)/MkLevel -q +MKLEVEL := $(DATA_BIN_DIR)/MkLevel +MKACTOR3D := $(DATA_BIN_DIR)/MkActor3d # Cygwin # ------ diff --git a/makefile.gfx b/makefile.gfx index 0b01ec1b1..f93fc3470 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -66,9 +66,55 @@ $(LEVELS_OUT_DIR)/%.lvl : $(LEVELS_IN_DIR)/%.pme GFX_DATA_OUT += $(LEVELS_OUT) +#---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- +# Actors +#---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- +ACTOR_IN_DIR := $(GRAF_DIR)/Characters +ACTOR_OUT_DIR := $(DATA_OUT)/Actors +ACTOR_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/Actors +ACTORS_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR) + +# Global flags +GENERIC_ACT_TEX_FLAGS = -c+ -t:27,1,1 -w+ -b+ +GEN_GRP_TEX_FLAGS= -t:28,1,1 + +actors: player + +cleanactors: cleanplayer + +#---------------------------------------------------------------------------- +# Player +#---------------------------------------------------------------------------- + +PLAYER_FILE := SpongeBob +PLAYER_IN_DIR:= $(ACTOR_IN_DIR)/$(PLAYER_FILE) +PLAYER_OUT_DIR := $(ACTOR_OUT_DIR) + +PLAYER_MOD_IN := $(PLAYER_IN_DIR)/$(PLAYER_FILE).Gin +PLAYER_MOD_OUT := $(PLAYER_OUT_DIR)/$(PLAYER_FILE).a3d +PLAYER_TEX_IN := $(PLAYER_IN_DIR)/*.bmp +PLAYER_TEX_OUT := $(PLAYER_OUT_DIR)/$(PLAYER_FILE).Tex + +PLAYER_DEP_IN := $(PLAYER_MOD_IN) $(PLAYER_TEX_IN) +PLAYER_DEP_OUT := $(PLAYER_MOD_OUT) $(PLAYER_TEX_OUT) + +player: $(PLAYER_DEP_OUT) + +cleanplayer: + @$(RM) -f $(PLAYER_DEP_OUT) + +$(PLAYER_DEP_OUT) : $(PLAYER_DEP_IN) + $(MKACTOR3D) $(PLAYER_MOD_IN) -o:$(PLAYER_OUT_DIR) -t:23,1,1 + +GFX_DATA_OUT += $(PLAYER_DEP_OUT) + +#---------------------------------------------------------------------------- #---------------------------------------------------------------------------- # Text translations #---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- .PHONY: translate cleantranslate LANGUAGES := swe \ @@ -325,6 +371,7 @@ GFX_DATA_OUT += $(SCRIPTS_OUT) GRAF_DIRS_TO_MAKE += $(TRANS_OUT_DIR) \ $(UI_GFX_OUT_DIR) \ + $(ACTORS_DIRS_TO_MAKE) \ $(LEVELS_OUT_DIRS) gdirs : $(GRAF_DIRS_TO_MAKE) @@ -364,6 +411,7 @@ $(BIGLUMP_OUT) : $(BIGLUMP_IN) # WARNING !!!! BigLump must be the last item that all is dependant on. GRL !!!! all : dirs gdirs \ + actors \ levels \ biglump @$(ECHO) Graphics made