changeset 99:140dda7f853d

Updates
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 17 Dec 2006 16:47:33 +0000
parents c856945880be
children 55f7140efa2f
files maps/Makefile
diffstat 1 files changed, 38 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/maps/Makefile	Sun Dec 17 11:57:21 2006 +0000
+++ b/maps/Makefile	Sun Dec 17 16:47:33 2006 +0000
@@ -1,9 +1,18 @@
 #
 # Settings
 #
-MAPLIST=laenor.map roth.map luc.map furn.map deso.map
+WORLDSCALE=0.5
+MAPSCALE=2
 
-TARGETS=$(patsubst %.map,%.html,$(MAPLIST)) $(patsubst %.map,%.ansi,$(MAPLIST)) $(patsubst %.map,%.png,$(MAPLIST))
+MAPLISTOFFS=			\
+	laenor.map:1313:1486	\
+	furn.map:2458:2615	\
+	roth.map:2786:15	\
+	luc.map:644:3811	\
+	deso.map:54:2285
+
+
+MAPLIST=laenor.map roth.map luc.map furn.map deso.map
 
 UPURL=mhamalai@students.oamk.fi:public_html/bat/maps/
 
@@ -12,21 +21,21 @@
 
 
 #
-# Utils
+# Target rules
 #
 COLORMAP_BIN=$(BINPATH)colormap$(EXEEXT)
 MKLOC_BIN=$(BINPATH)mkloc$(EXEEXT)
 MAP2PPM_BIN=$(BINPATH)map2ppm$(EXEEXT)
-
+COMBINE_BIN=$(BINPATH)combine$(EXEEXT)
+TARGETS=$(patsubst %.map,%.html,$(MAPLIST)) \
+	$(patsubst %.map,%.ansi,$(MAPLIST)) \
+	$(patsubst %.map,%.png,$(MAPLIST))
 
-#
-# Target rules
-#
 all: $(TARGETS)
 
 %.nloc: %.loc
 	grep -v UNK $< > $@
-	$(MKLOC_BIN) -v -g -l $@ -m $(patsubst %.loc,%.map,$<) -o $@
+	$(MKLOC_BIN) -v -g -L -l $@ -m $(patsubst %.loc,%.map,$<) -o $@
 
 %.tmp: %.map %.loc
 	$(MKLOC_BIN) -v -o $@ -m $< -l $(patsubst %.map,%.loc,$<)
@@ -37,13 +46,31 @@
 %.html: %.tmp %.desc $(COLORMAP_BIN)
 	$(COLORMAP_BIN) -t "`cat $(patsubst %.tmp,%.desc,$<)`" -vaC -f xhtml -o $@ $<
 
-%.png: %.map $(MAP2PPM_BIN)
-	$(MAP2PPM_BIN) -v $< | pnmscale 2 | pnmtopng -compression=9 > $@
+%.script: %.map %.loc $(MKLOC_BIN)
+	$(MKLOC_BIN) -v -m $< -l $(patsubst %.map,%.loc,$<) -s $(MAPSCALE) -S -o $@
+
+%.ppm: %.map $(MAP2PPM_BIN)
+	$(MAP2PPM_BIN) -v $< | pnmscale $(MAPSCALE) > $@
+
+%.png: %.ppm %.script
+	/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
+
+world.map: $(MAPLIST) $(COMBINE_BIN)
+	$(COMBINE_BIN) -v -f "~" $(MAPLISTOFFS) -o $@
+
+world.loc: $(patsubst %.map,%.loc,$(MAPLIST))
+	for i in $(MAPLISTOFFS); do $(MKLOC_BIN) -v -L -l `echo "$$i"|sed "s/^\([^\.]*\).map:.*/\1.loc/"` -m `echo "$$i"|sed "s/^\([^:]*\):\([0-9]*\):\([0-9]*\)/\1 -x \2 -y \3/"`; done > $@
+
+world.jpg: world.map world.loc $(MAP2PPM_BIN)
+	$(MKLOC_BIN) -v -m $< -l $(patsubst %.map,%.loc,$<) -s $(WORLDSCALE) -S -o TMP.script
+	$(MAP2PPM_BIN) -v $< | pnmscale $(WORLDSCALE) -verbose > TMP.ppm
+	/bin/sh TMP.script TMP.ppm $@
+
 
 #
 # Special targets
 #
-upload: $(TARGETS) *.loc
+upload: $(TARGETS) world.jpg *.loc
 	scp $+ $(UPURL)
 
 clean: