Mercurial > hg > batmud > maputils
changeset 1767:aba021739dae
Actually make the pkg-config libpng autodetect work.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 26 Oct 2017 21:43:07 +0300 |
| parents | 914543dfada1 |
| children | 7db813d0d2a6 |
| files | Makefile Makefile.gen Makefile.w32 |
| diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Oct 26 20:33:46 2017 +0300 +++ b/Makefile Thu Oct 26 21:43:07 2017 +0300 @@ -26,7 +26,7 @@ # For Solaris you may need: #CFLAGS += -DHAVE_UINT_T -HAVE_LIBPNG ?= `pkg-config --atleast-version=1.2 libpng && echo "yes"` +HAVE_LIBPNG ?= $(shell pkg-config --atleast-version=1.2 libpng && echo "yes") LIBPNG_CFLAGS ?= `pkg-config --cflags libpng` LIBPNG_LDFLAGS ?= `pkg-config --libs libpng`
--- a/Makefile.gen Thu Oct 26 20:33:46 2017 +0300 +++ b/Makefile.gen Thu Oct 26 21:43:07 2017 +0300 @@ -41,10 +41,13 @@ $(MKLOC_BIN) $(COMBINE_BIN) $(MAPSTATS_BIN) \ $(addprefix $(MAP_PATH),$(filter %.html,$(MAP_FILES))) + ifeq ($(HAVE_LIBPNG),yes) -LIBPNG_CFLAGS += -DHAVE_LIBPNG=1 +MAP2PPM_CFLAGS += -DHAVE_LIBPNG=1 $(LIBPNG_CFLAGS) +MAP2PPM_LDFLAGS += $(LIBPNG_LDFLAGS) endif + THLIBS_A = $(OBJPATH)thlibs.a THLIBS_OBJ = th_util.o th_string.o th_args.o th_datastruct.o @@ -56,7 +59,7 @@ $(MAP2PPM_BIN): map2ppm.c $(LIBMAPUTILS_OBJ) $(THLIBS_A) $(THLIBS_DEP) @echo " LINK $@" - @$(CC) $(CFLAGS) -o $@ $< $(LIBMAPUTILS_OBJ) $(LIBPNG_CFLAGS) $(LIBPNG_LDFLAGS) $(THLIBS_A) $(LDFLAGS) + @$(CC) $(CFLAGS) -o $@ $< $(LIBMAPUTILS_OBJ) $(MAP2PPM_CFLAGS) $(MAP2PPM_LDFLAGS) $(THLIBS_A) $(LDFLAGS) $(BINPATH)%$(EXEEXT): %.c $(LIBMAPUTILS_OBJ) $(LIBLOCFILE_OBJ) $(THLIBS_A) $(THLIBS_DEP)