summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-11-07 15:58:54 +0000
committertron <tron@openttd.org>2006-11-07 15:58:54 +0000
commite37b5d13bdce9ec5711bfe38c93969d61188e139 (patch)
treebf1835df12decb38d730d0a8debb5b75a24c9d22
parent1dd5dfd3b382a0904ce5eddab6032c7f658bac23 (diff)
downloadopenttd-e37b5d13bdce9ec5711bfe38c93969d61188e139.tar.xz
(svn r7101) Evaluate the necessary flags for libpng once per make run, not every time the CFLAGS/LIBS variables are used
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6b3f95a0c..4b73d5fde 100644
--- a/Makefile
+++ b/Makefile
@@ -469,20 +469,22 @@ endif
# libpng config
ifdef WITH_PNG
CDEFS += -DWITH_PNG
-CFLAGS += $(shell $(LIBPNG_CONFIG) --cppflags --I_opts)
+CCFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --cppflags --I_opts)
+CFLAGS += $(CCFLAGS_PNG)
# 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
+LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a
else
-LIBS += $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS))
+LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS))
endif
else
-LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS))
+LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS))
endif
+LIBS += $(LDFLAGS_PNG)
endif
# use std C++ lib: