diff options
| author | rubidium <rubidium@openttd.org> | 2010-10-24 15:49:38 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-10-24 15:49:38 +0000 |
| commit | c5015bb5bddd25dc912319a692b3fcbef1d030a6 (patch) | |
| tree | a42b3bb0500a5f2a69196ac236380c7d0d4a93b0 /Makefile.grf.in | |
| parent | 3317f1c01e40a6914490350633b6f6d7b7fe17e5 (diff) | |
| download | openttd-c5015bb5bddd25dc912319a692b3fcbef1d030a6.tar.xz | |
(svn r21026) -Codechange: move from pcx to png extra grf sprites as they are easier to handle/view. They also take less space in a checkout. Furthermore this requires a recent GRFCodec nightly with PNG support enabled.
Diffstat (limited to 'Makefile.grf.in')
| -rw-r--r-- | Makefile.grf.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.grf.in b/Makefile.grf.in index e6a2a578c..196c11f0f 100644 --- a/Makefile.grf.in +++ b/Makefile.grf.in @@ -43,7 +43,7 @@ MD5SUM := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum") # Some "should not be changed" settings. NFO_FILES := $(GRF_DIR)/*.nfo -PCX_FILES := $(GRF_DIR)/*.pcx +PNG_FILES := $(GRF_DIR)/*.png # Build the GRF. all: $(BIN_DIR)/openttd.grf @@ -53,14 +53,14 @@ $(OBJS_DIR)/sprites: $(Q)-mkdir "$@" # Generic -$(BIN_DIR)/openttd.grf: $(PCX_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites +$(BIN_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites @# Only try; if nforenum isn't available, just retouch the file as they likely didn't need it anyway. $(Q) ($(NFORENUM) --help > /dev/null 2>&1 && $(MAKE) $(OBJS_DIR)/openttd.grf && cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf) || ([ -e $(BIN_DIR)/openttd.grf ] && touch $(BIN_DIR)/openttd.grf && echo "no NFORenum and GRFCodec found, skipping rebuild of openttd.grf...") || (echo "no NFORenum and GRFCodec found, but no openttd.grf either. Install NFORenum and GRFCodec." && exit 1) # Yeah, we'd like to use -i in the sed, but Mac OS X's sed and GNU sed just can't agree on the usage of -i. In any case either one of them fails. -$(OBJS_DIR)/openttd.grf: $(PCX_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites +$(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites $(E) '$(STAGE) Assembling openttd.nfo' - $(Q)-cp $(PCX_FILES) $(OBJS_DIR)/sprites 2> /dev/null + $(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null $(Q) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo $(Q) $(NFORENUM) $(OBJS_DIR)/sprites/openttd.nfo $(E) '$(STAGE) Compiling openttd.grf' |