diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2015-12-07 00:20:33 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@intel.com> | 2015-12-07 09:32:59 -0800 |
| commit | 8178e5b02cafe129166e82a9d552a5f3b258094a (patch) | |
| tree | 7ec5a168bf345810752bdfd84d0e4f165169cd8b /Makefile.am | |
| parent | 16541cf2e377a5a8e17a54fdd0e6a3414a9cbc61 (diff) | |
autotools: Support libpng16 or libpng12
libpng16 is given priority
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Chad Versace <chad.versace@intel.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 95d7493..f581360 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,7 @@ common_CFLAGS = -Wall -O0 -g3 \ -Werror=format \ -Werror=incompatible-pointer-types \ -Werror=int-conversion \ + $(libpng_CFLAGS) \ $(NULL) CFLAGS = -std=gnu11 \ @@ -119,7 +120,7 @@ BUILT_SOURCES = \ src/tests/func/ssbo/interleave-spirv.h \ src/tests/stress/lots-of-surface-state-spirv.h -bin_crucible_LDADD = $(MESA_LDFLAGS) -lm -lvulkan -lpthread -lpng16 +bin_crucible_LDADD = $(MESA_LDFLAGS) -lm -lvulkan -lpthread $(libpng_LIBS) %-spirv.h: %.c misc/glsl_scraper.py $(AM_V_GEN) $(PYTHON3) $(srcdir)/misc/glsl_scraper.py --with-glslc=$(GLSLC) -o $@ $< |