diff options
author | rubidium <rubidium@openttd.org> | 2011-12-05 20:11:42 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-12-05 20:11:42 +0000 |
commit | d60ec559836e9a42ca58ff4176587f92f5262139 (patch) | |
tree | 1dbe90ed99de16775067b78382e8cbf4ee10654b /Makefile.grf.in | |
parent | ce21a91db7eadc51a34dad69d9e8f16dd6b60de4 (diff) | |
download | openttd-d60ec559836e9a42ca58ff4176587f92f5262139.tar.xz |
(svn r23438) -Fix [FS#4867]: perform checks for nforenum/grfcodec in configure, including a version check so a proper error can be given when a too old grfcodec or nforenum is used
Diffstat (limited to 'Makefile.grf.in')
-rw-r--r-- | Makefile.grf.in | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Makefile.grf.in b/Makefile.grf.in index 33fbeeeb9..2112f2a8a 100644 --- a/Makefile.grf.in +++ b/Makefile.grf.in @@ -34,11 +34,8 @@ else E = @echo endif -# Some configurational settings for your environment. -# If GRFCodec doesn't know a command, it'll exit with a non-zero exit code. -GRFCODEC := $(shell grfcodec -s -v >/dev/null 2>/dev/null && echo "grfcodec -s" || echo "grfcodec") -# Old NFORenums don't give an error code when a parameter isn't known, so we have to work around that. -NFORENUM := $(shell [ `nforenum -s -v 2>/dev/null | wc -l ` -eq 1 ] && echo "nforenum -s" || echo "nforenum") +GRFCODEC := !!GRFCODEC!! +NFORENUM := !!NFORENUM!! MD5SUM := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum") # Some "should not be changed" settings. @@ -46,28 +43,30 @@ NFO_FILES := $(GRF_DIR)/*.nfo $(GRF_DIR)/rivers/*.nfo PNG_FILES := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png # Build the GRF. +ifdef GRFCODEC all: $(BIN_DIR)/openttd.grf +else +all: +endif # Make sure the sprites directory exists. $(OBJS_DIR)/sprites: $(Q)-mkdir "$@" # Generic -$(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) +$(BIN_DIR)/openttd.grf: $(OBJS_DIR)/openttd.grf + $(Q)cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf + $(E) '$(STAGE) Updating base graphics sets' + $(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF = [0-9a-f]*$$/OPENTTD.GRF = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done # 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: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites $(E) '$(STAGE) Assembling openttd.nfo' $(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 + $(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo $(E) '$(STAGE) Compiling openttd.grf' - $(Q) $(GRFCODEC) -e -p1 $(OBJS_DIR)/openttd.grf - $(Q) cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf - $(E) '$(STAGE) Updating base graphics sets' - $(Q) for grf in $(BIN_DIR)/orig*.obg; do sed 's/^OPENTTD.GRF = [0-9a-f]*$$/OPENTTD.GRF = '`$(MD5SUM) $(BIN_DIR)/openttd.grf | sed 's@ .*@@'`'/' $$grf > $$grf.tmp && mv $$grf.tmp $$grf; done + $(Q) $(GRFCODEC) -s -e -p1 $(OBJS_DIR)/openttd.grf # Clean up temporary files. clean: |