Mercurial > hg > batmud > maputils
changeset 1624:6632f32db8a3
Fix some build things.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 09 Mar 2016 21:18:35 +0200 |
| parents | 032cdfc4f017 |
| children | bb25d1cbe657 |
| files | Makefile.gen config.mak old/Makefile world/Makefile |
| diffstat | 4 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Wed Mar 09 20:13:32 2016 +0200 +++ b/Makefile.gen Wed Mar 09 21:18:35 2016 +0200 @@ -64,7 +64,7 @@ $(COLORMAP_BIN) $(COLORMAP_OPTS) `cat $(patsubst %.map,%.opts,$<)` $(COLORMAP_HTML) -t "`cat $(patsubst %.map,%.name,$<)`" -o $@ $< $(MAP_PATH)%.html: $(MAP_PATH)%.map $(MAP_PATH)%.loc $(MAP_PATH)%.desc $(MKCITYMAP_BIN) - $(MKCITYMAP_BIN) -t "`cat $(patsubst %.map,%.desc,$<)`" $< $(patsubst %.map,%.loc,$<) `cat $(patsubst %.map,%.opts,$<)` -u "www/urchin.inc.php" -o "$@" + $(MKCITYMAP_BIN) $(MKCITYMAP_OPTS) -t "`cat $(patsubst %.map,%.desc,$<)`" $< $(patsubst %.map,%.loc,$<) `cat $(patsubst %.map,%.opts,$<)` -o "$@" ###
--- a/config.mak Wed Mar 09 20:13:32 2016 +0200 +++ b/config.mak Wed Mar 09 21:18:35 2016 +0200 @@ -6,5 +6,6 @@ UPLOAD_URL=ccr@tnsp.org:/var/www/tnsp.org/maps/ -COLORMAP_OPTS=-u "www/urchin.inc.php" -a -C +#COLORMAP_OPTS=-u "www/urchin.inc.php" -a -C +COLORMAP_OPTS=-a -C COLORMAP_HTML=-f html5
--- a/old/Makefile Wed Mar 09 20:13:32 2016 +0200 +++ b/old/Makefile Wed Mar 09 21:18:35 2016 +0200 @@ -35,7 +35,7 @@ @ln -s $< $@ batcity.html: batcity.map batcity.loc tooltip.js - $(MKCITYMAP_BIN) -T -t "Old BatCity map" -u ../www/urchin.inc.php $< batcity.loc -o "$@" + $(MKCITYMAP_BIN) $(MKCITYMAP_OPTS) -T -t "Old BatCity map" $< batcity.loc -o "$@" twomi-batmap.ansi: twomi-batmap.tmp $(COLORMAP_BIN) $(COLORMAP_OPTS) -O -f ansi -t "`cat $(patsubst %.tmp,%.desc,$<)`" $< -o $@
--- a/world/Makefile Wed Mar 09 20:13:32 2016 +0200 +++ b/world/Makefile Wed Mar 09 21:18:35 2016 +0200 @@ -7,7 +7,8 @@ TARGETS=$(addsuffix .html,$(MAPLIST)) \ $(addsuffix .ansi,$(MAPLIST)) \ $(addsuffix .png,$(MAPLIST)) \ - $(addsuffix .htm,$(MAPLIST)) + $(addsuffix .htm,$(MAPLIST)) \ + util.js ### @@ -42,7 +43,7 @@ ### # Upload changed files to site -upload: $(TARGETS) renardy.map tormentas.map $(LOCLIST) util.js +upload: $(TARGETS) renardy.map tormentas.map $(LOCLIST) @scp -C $? $(UPLOAD_URL) @touch $@