diff world/Makefile @ 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 a01c82b8b7d2
children 6878dbdbc11e
line wrap: on
line diff
--- a/world/Makefile	Tue Aug 01 16:17:58 2023 +0300
+++ b/world/Makefile	Wed Aug 02 12:11:49 2023 +0300
@@ -1,13 +1,13 @@
-include ../config.mak
-include config.mak
-
+###
+### Includes and settings
 ###
-### Detect if we have some 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")
+include ../config.mak
+include ../Makefile.maps
+include ../Makefile.paths
+
+BINPATH=../bin/
+EXEEXT=
+
 
 ifeq ($(HAVE_CURL),yes)
 HTTPGET ?= curl -o
@@ -63,16 +63,11 @@
 
 
 ###
-### Maps
+### Targets
 ###
 maps: $(addsuffix .ppm,$(WORLD_MAPS)) $(TARGETS)
 
-include Makefile.inc
 
-
-###
-### Special targets
-###
 changelog.txt: $(addsuffix .map,$(WORLD_MAPS)) \
 	$(addsuffix .loc,$(WORLD_MAPS)) \
 	$(addprefix ../$(MISC_MAPS_PATH),$(addsuffix .map,$(MISC_MAPS))) \