diff options
| author | bjarni <bjarni@openttd.org> | 2005-06-19 17:05:24 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-06-19 17:05:24 +0000 |
| commit | 1a96770d81d359397dc682e73a3db32041df04ab (patch) | |
| tree | 47c6fb4b2ff3e0ab03934fe92ff146c4d4f651ae | |
| parent | 4754dad0d65a969dc8ab6eea824fe34c40c52e89 (diff) | |
| download | openttd-1a96770d81d359397dc682e73a3db32041df04ab.tar.xz | |
(svn r2461) -Feature [Makefile] libpng-config can now be called something else in Makefile.config
useful if you for some reason got a libpng-config, which is called something else
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | makefiledir/Makefile.config_writer | 1 | ||||
| -rw-r--r-- | makefiledir/Makefile.libdetection | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -149,6 +149,10 @@ else CONFIG_INCLUDED:=1 endif +ifndef LIBPNG-CONFIG +LIBPNG-CONFIG :=libpng-config +endif + # updates Makefile.config if it's outdated ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION)) ifndef MANUAL_CONFIG # manual config should not check this @@ -461,19 +465,19 @@ endif # libpng config ifdef WITH_PNG CDEFS += -DWITH_PNG -CFLAGS += $(shell libpng-config --cflags) +CFLAGS += $(shell $(LIBPNG-CONFIG) --cflags) # seems like older libpng versions are broken and need this PNGCONFIG_FLAGS = --ldflags --libs ifdef STATIC ifdef OSX # Seems like we need a tiny hack for OSX static to work -LIBS += $(shell libpng-config --prefix)/lib/libpng.a +LIBS += $(shell $(LIBPNG-CONFIG) --prefix)/lib/libpng.a else -LIBS += $(shell libpng-config --static $(PNGCONFIG_FLAGS)) +LIBS += $(shell $(LIBPNG-CONFIG) --static $(PNGCONFIG_FLAGS)) endif else -LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS)) +LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS)) endif endif diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index d48e17798..615517f98 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -97,6 +97,7 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,\# misc) $(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG)) + $(call CONFIG_LINE,LIBPNG-CONFIG:=$(LIBPNG-CONFIG)) $(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER)) $(call CONFIG_LINE,CONFIG_INCLUDED:=yes) $(call CONFIG_LINE,PATH_SET:=$(PATH_SET)) diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index 18bd2e490..1167117ae 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -66,7 +66,7 @@ WITH_NETWORK:=1 WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null) # libpng detection -WITH_PNG:=$(shell libpng-config --version 2>/dev/null) +WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null) ifdef WITH_PNG # LibPNG depends on Zlib |