avmedia/Library_avmediaogl.mk | 3 +-- external/cairo/ExternalProject_cairo.mk | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit a9a9f694089505c5fbbf5e099d5e185e1a46ab29 Author: Michael Stahl <[email protected]> Date: Tue Mar 29 17:23:02 2016 +0200 avmedia: the Module makefile already checks and disables that Change-Id: I4620a0358e06e56684954f208d19bd4350e397a5 diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index 24133b8..b7498bf 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(ENABLE_OPENGL),TRUE) $(eval $(call gb_Library_Library,avmediaogl)) $(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl)) @@ -57,5 +56,5 @@ $(eval $(call gb_Library_add_libs,avmediaogl,\ -lGL \ )) endif -endif + # vim: set noet sw=4 ts=4: commit 0c58b399ea2c163babeff42e8fa5a28df847aba4 Author: Michael Stahl <[email protected]> Date: Tue Mar 29 17:22:18 2016 +0200 cairo: fix malformed conditionals, these should have empty "then" branch Change-Id: Idc83582f0b4317a4d272bc5fa8eaf2dc98785fc6 diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index c826dcb..e6a30ec 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -46,8 +46,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : 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 $(SYSTEM_FREETYPE,),FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \ - $(if $(SYSTEM_FONTCONFIG,),FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \ + $(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \ + $(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
