Repository.mk | 2 -- RepositoryExternal.mk | 2 -- 2 files changed, 4 deletions(-)
New commits: commit 66a117c8473cfa8181e139e406470428edffd32c Author: Tor Lillqvist <[email protected]> Date: Wed Aug 3 21:19:56 2016 +0300 ENABLE_OPENGL does not mean whether to enable OpenGL use in general It refers to only the (old) OpenGL slideshow transition code. So no reason to have glew conditional on it. Change-Id: I13bc3e3c25fd7a33e05b39b405af0c85ab6a8e96 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 04546e5..c880d63 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -183,7 +183,6 @@ endef endif # SYSTEM_CPPUNIT -ifneq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),) ifneq ($(SYSTEM_GLEW),) define gb_LinkTarget__use_glew @@ -229,7 +228,6 @@ $(call gb_ExternalProject_use_external_project,$(1),glew) endef endif # SYSTEM_GLEW -endif # ENABLE_OPENGL ifneq ($(SYSTEM_GLYPHY),) commit e782dc304415e47652eb33be86ce8c28062c3426 Author: Tor Lillqvist <[email protected]> Date: Wed Aug 3 21:17:34 2016 +0300 ENABLE_OPENGL does not mean whether to enable OpenGL use in general It refers to only the OpenGL slideshow transitions. So no reason for avmediaogl to depend on it. Change-Id: If85ad6bcd077d9e753c259aa8dc6ad5629105136 diff --git a/Repository.mk b/Repository.mk index 4dcd930..157fdd4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -605,13 +605,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ )) -ifeq ($(ENABLE_OPENGL),TRUE) ifeq ($(ENABLE_GLTF),TRUE) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ avmediaogl \ )) endif -endif ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
