Mercurial > hg > batmud > maputils
changeset 2523:8b6a32b66e0f
Improved comments in the build system files.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 14 Aug 2023 12:53:35 +0300 |
parents | 2b48d0ed6b56 |
children | 73f3062d717c |
files | Makefile Makefile.maps config.mak |
diffstat | 3 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Aug 14 12:50:28 2023 +0300 +++ b/Makefile Mon Aug 14 12:53:35 2023 +0300 @@ -1,6 +1,6 @@ -# -# Configuration settings for typical UNIX -# +### +### Configuration settings for typical UNIX +### # Installation prefix PREFIX = /usr/local @@ -17,6 +17,10 @@ #CFLAGS += -DHAVE_SYS_TYPES_H CFLAGS += -DHAVE_INTTYPES_H + +### +### Detect various libraries etc +### HAVE_LIBPNG ?= $(shell pkg-config --atleast-version=1.2 libpng && echo "yes") LIBPNG_CFLAGS ?= $(shell pkg-config --cflags libpng) LIBPNG_LDFLAGS ?= $(shell pkg-config --libs libpng) @@ -29,13 +33,16 @@ CFLAGS += $(shell pkg-config --atleast-version=3.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS32=1") -# Static compilation +### +### Static compilation for mapsearch +### ifdef STATIC $(info Using static build for mapsearch.) LIBWEBSOCKETS_LIBS = libwebsockets.a libz.a libssl.a libcrypto.a libev.a libuv.a LIBWEBSOCKETS_LDFLAGS = $(addprefix /usr/lib/x86_64-linux-gnu/,$(LIBWEBSOCKETS_LIBS)) -pthread -lm -ldl -static endif + ### ### Unix targets ###
--- a/Makefile.maps Mon Aug 14 12:50:28 2023 +0300 +++ b/Makefile.maps Mon Aug 14 12:53:35 2023 +0300 @@ -1,3 +1,7 @@ +### +### Common Make rules for some map targets +### + ### ### Intermediate file targets ###
--- a/config.mak Mon Aug 14 12:50:28 2023 +0300 +++ b/config.mak Mon Aug 14 12:53:35 2023 +0300 @@ -43,17 +43,21 @@ ### ### Misc stuff ### +# rsync command for uploading files RSCP = rsync -vptogzL -e ssh UPLOAD_URL = ccr@tnsp.org:/var/www/tnsp.org/maps/ +# Download URL for raw ASCII world maps BATMAP_URL = https://www.bat.org/maps/raw/ +# List of miscellaneous maps to build MISC_MAPS_PATH=misc/ MISC_MAPS=votk faerieforest lanzia rilynttar lorenchia \ esiris esiris2 arelium calythien tyr_farwyn \ dortlewall vendace_shore +# Continent maps etc CONT_MAPS=laenor rothikgen lucentium furnachia desolathya renardy WORLD_MAPS=$(CONT_MAPS) tormentas EXTRA_WORLD_MAPS=lost_vale