From 482d7ce61b423600b41b459eb26a2cc221cd0acf Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 25 Nov 2016 20:25:27 +0000 Subject: change from glew to epoxy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit because that works under wayland out of the box and gtk3 uses it already Change-Id: Iefaac31e325534a81a5389f752804af917c1baef Reviewed-on: https://gerrit.libreoffice.org/31213 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- avmedia/Library_avmedia.mk | 2 +- avmedia/Library_avmediaogl.mk | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'avmedia') diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 4e8f3b1aecb4..e662fc379382 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\ ifeq ($(ENABLE_HEADLESS),) $(eval $(call gb_Library_use_externals,avmedia,\ - glew \ + epoxy \ )) endif diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index b7498bfb1a15..191fb75bc6dd 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_sdk_api,avmediaogl)) $(eval $(call gb_Library_use_externals,avmediaogl, \ boost_headers \ libgltf \ - glew \ + epoxy \ glm_headers \ )) @@ -51,10 +51,6 @@ else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ OpenGL \ )) -else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Library_add_libs,avmediaogl,\ - -lGL \ -)) endif # vim: set noet sw=4 ts=4: -- cgit