diff config.mak @ 2506:de2e01e4343b

Large refactoring and cleanup of the build system.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 02 Aug 2023 12:11:49 +0300
parents 0b909a95d689
children 55201a1420df
line wrap: on
line diff
--- a/config.mak	Tue Aug 01 16:17:58 2023 +0300
+++ b/config.mak	Wed Aug 02 12:11:49 2023 +0300
@@ -1,6 +1,19 @@
 ###
 ### Global settings
 ###
+WORLDMAP_FONT_FILE=MonospaceBold.ttf
+WORLDMAP_FONT_SCALE=8.0
+WORLDMAP_UNIT_SIZE=6.0
+WORLDMAP_SCALE=6
+
+MKLOC_OPTS=
+MAP2PPM_OPTS=
+
+#COLORMAP_OPTS=-u "www/urchin.inc.php" -a -C
+COLORMAP_OPTS=-a -C
+COLORMAP_HTML=-f html5
+
+
 # Unfortunately we require Bash for now due to {} brace expansion
 SHELL = /bin/bash
 
@@ -14,10 +27,13 @@
 #LDFLAGS += -lasan
 
 
-#COLORMAP_OPTS=-u "www/urchin.inc.php" -a -C
-COLORMAP_OPTS=-a -C
-COLORMAP_HTML=-f html5
-
+###
+### Detect things
+###
+HAVE_CURL ?= $(shell curl --version > /dev/null 2>&1 && echo "yes")
+HAVE_WGET ?= $(shell wget --version > /dev/null 2>&1 && echo "yes")
+HAVE_PHP ?= $(shell php --version > /dev/null 2>&1 && echo "yes")
+HAVE_GIMP_CONSOLE ?= $(shell gimp-console --version > /dev/null 2>&1 && echo "yes")
 
 # Wget or curl are autodetected but you can force them here
 #HTTPGET ?= curl -o
@@ -27,16 +43,20 @@
 ###
 ### Misc stuff
 ###
-RSCP = rsync -vptogzL -e ssh
-UPLOAD_URL = ccr@tnsp.org:/var/www/tnsp.org/maps/
 CFLAGS += -DTH_PROG_AUTHOR="\"By Matti 'ccr' Hamalainen (C) Copyright 2006-2023 TNSP\""
 CFLAGS += -DTH_PROG_LICENSE="\"This software is distributed under GNU General Public License version 2\""
 
+RSCP = rsync -vptogzL -e ssh
 
-###
-### List of misc map targets
-###
-MISC_MAPS_PATH = misc/
+UPLOAD_URL = ccr@tnsp.org:/var/www/tnsp.org/maps/
+BATMAP_URL = https://www.bat.org/maps/raw/
+
+MISC_MAPS_PATH=misc/
 MISC_MAPS=votk faerieforest lanzia rilynttar lorenchia \
 	esiris esiris2 arelium calythien tyr_farwyn \
 	dortlewall vendace_shore
+
+CONT_MAPS=laenor rothikgen lucentium furnachia desolathya renardy
+WORLD_MAPS=$(CONT_MAPS) tormentas
+
+