Mercurial > hg > batmud > maputils

changeset 2679:02c26bfd0ac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset c4fafcc43d83
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 03 Mar 2024 04:46:43 +0200
parents 433e85a00173
children 25af2eb98f89
files Makefile config.mak
diffstat 2 files changed, 15 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Mar 03 03:41:14 2024 +0200
+++ b/Makefile	Sun Mar 03 04:46:43 2024 +0200
@@ -19,6 +19,21 @@
 
 
 ###
+### 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)
+
+HAVE_LIBWEBSOCKETS ?= $(shell pkg-config --atleast-version=2 libwebsockets && echo "yes")
+LIBWEBSOCKETS_CFLAGS ?= $(shell pkg-config --cflags libwebsockets)
+LIBWEBSOCKETS_LDFLAGS ?= $(shell pkg-config --libs libwebsockets)
+
+CFLAGS += $(shell pkg-config --atleast-version=2.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS22=1")
+CFLAGS += $(shell pkg-config --atleast-version=3.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS32=1")
+
+
+###
 ### Static compilation for mapsearch
 ###
 ifdef STATIC
--- a/config.mak	Sun Mar 03 03:41:14 2024 +0200
+++ b/config.mak	Sun Mar 03 04:46:43 2024 +0200
@@ -30,7 +30,6 @@
 ###
 ### 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")
@@ -41,18 +40,6 @@
 #HTTPGET ?= wget -O
 
 
-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)
-
-HAVE_LIBWEBSOCKETS ?= $(shell pkg-config --atleast-version=2 libwebsockets && echo "yes")
-LIBWEBSOCKETS_CFLAGS ?= $(shell pkg-config --cflags libwebsockets)
-LIBWEBSOCKETS_LDFLAGS ?= $(shell pkg-config --libs libwebsockets)
-
-CFLAGS += $(shell pkg-config --atleast-version=2.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS22=1")
-CFLAGS += $(shell pkg-config --atleast-version=3.2 libwebsockets && echo "-DHAVE_LIBWEBSOCKETS32=1")
-
-
 ###
 ### Misc stuff
 ###