mirror of https://github.com/OpenTTD/OpenTTD
(svn r7101) Evaluate the necessary flags for libpng once per make run, not every time the CFLAGS/LIBS variables are used
parent
1dd5dfd3b3
commit
e37b5d13bd
10
Makefile
10
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:
|
||||
|
|
Loading…
Reference in New Issue