Mercurial > hg > batmud > maputils

changeset 266:5e6bac0c569a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jun 2007 11:58:50 +0000
parents 5dabdd17ee64
children aa85d87d7b75
files Makefile.gen
diffstat 1 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Tue Jun 05 11:58:34 2007 +0000
+++ b/Makefile.gen	Tue Jun 05 11:58:50 2007 +0000
@@ -17,7 +17,7 @@
 MKMAP_BIN=$(BINPATH)mkmap$(EXEEXT)
 MKSPECIAL_BIN=$(BINPATH)mkspecial$(EXEEXT)
 COLORMAP_BIN=$(BINPATH)colormap$(EXEEXT)
-MAKEBCMAP_BIN=$(BINPATH)mkbcmap$(EXEEXT)
+MKBCMAP_BIN=$(BINPATH)mkbcmap$(EXEEXT)
 DIFFMAP_BIN=$(BINPATH)diffmap$(EXEEXT)
 MKLOC_BIN=$(BINPATH)mkloc$(EXEEXT)
 MAP2PPM_BIN=$(BINPATH)map2ppm$(EXEEXT)
@@ -25,13 +25,14 @@
 COMBINE_BIN=$(BINPATH)combine$(EXEEXT)
 
 TARGETS=$(MKMAP_BIN) $(COLORMAP_BIN) $(MKSPECIAL_BIN)	\
-	$(MAKEBCMAP_BIN) $(DIFFMAP_BIN)	$(MAP2PPM_BIN)	\
+	$(MKBCMAP_BIN) $(DIFFMAP_BIN)	$(MAP2PPM_BIN)	\
 	$(MKLOC_BIN) $(MAP3D_BIN) $(COMBINE_BIN)	\
 	votk.html lanzia.html
 
 MAPFILES=tooltip.js votk.html votk.map	\
 	lanzia.html lanzia.map		\
-	rilynttar.html
+	rilynttar.html rilynttar.map	\
+	esiris.html esiris.map
 
 
 #
@@ -54,7 +55,7 @@
 $(COLORMAP_BIN): colormap.c maputils.o th_util.o th_args.o th_string.o
 	$(COMP) -o $@ $+ $(LDFLAGS)
 
-$(MAKEBCMAP_BIN): mkbcmap.c maputils.o th_util.o th_string.o
+$(MKBCMAP_BIN): mkbcmap.c maputils.o th_util.o th_string.o
 	$(COMP) -o $@ $+ $(LDFLAGS)
 
 $(DIFFMAP_BIN): diffmap.c maputils.o th_util.o
@@ -69,13 +70,6 @@
 $(COMBINE_BIN): combine.c maputils.o th_util.o th_args.o th_string.o
 	$(COMP) -o $@ $+ $(LDFLAGS)
 
-
-%.cmap: %.raw $(MKMAP_BIN)
-	$(MKMAP_BIN) -o $@ -r 10 -w 21 -h 21 $< -v -d -m 80 -f 99
-
-%.map: %.raw $(MKMAP_BIN)
-	$(MKMAP_BIN) -o $@ -r 10 -w 13 -h 7 $< -v -d -m 70 -f 99
-
 %.png: %.map $(MAP2PPM_BIN)
 	$(MAP2PPM_BIN) -O $< | pnmscale 5 | pnmtopng -compression=9 > $@
 
@@ -85,6 +79,8 @@
 lanzia.html: lanzia.map $(COLORMAP_BIN)
 	$(COLORMAP_BIN) -t "The Isle of Lanzia" -aOC -f xhtml -o $@ $<
 
+%.html: %.cmap %.cnam $(MKBCMAP_BIN)
+	$(MKBCMAP_BIN) "`cat $(patsubst %.cmap,%.desc,$<)`" $< $(patsubst %.cmap,%.cnam,$<) > $@
 
 #
 # Special targets