diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:21:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:08 +0100 |
| commit | 04ff535f72c1fbc5f7dbc8cc54ed9b23f7e130f9 (patch) | |
| tree | 52cb40ab9b0e01c26e6b94f1039bc5d36a578f59 /external/cairo | |
| parent | 23647595d77b85b5dac0d5762987a3ba2533ffd9 (diff) | |
normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 90420f63dde3..d055db06429c 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -36,8 +36,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ - COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ - ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ + COMPRESS=$(if $(SYSTEM_ZLIB),compress,z_compress) \ + ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ |