diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 17:22:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 17:49:58 +0200 |
| commit | 416b321666da20857a87b4a8c3991caed1f24587 (patch) | |
| tree | 524048c6f0690fe81d3ea5123437f57c1afe0e37 /cairo | |
| parent | cc858aca0ebf653eebceaf09e2316763d8d81051 (diff) | |
libpng: remove ExternalPackage_libpng
Change-Id: I478a057c07b9fe850401b96297a14d7842c0703f
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index e27bf37d3518..0326b5c05c2c 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ ZLIB3RDLIB=-lz \ - $(if $(filter NO,$(SYSTEM_LIBPNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \ + png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ $(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \ |