diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-25 20:25:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:33:18 +0000 |
| commit | 482d7ce61b423600b41b459eb26a2cc221cd0acf (patch) | |
| tree | 8da6edb8200889d93f0b344e61ed779c037a590f /avmedia | |
| parent | 178e38dd82a2cffb2db747c7be82ba7a48338968 (diff) | |
change from glew to epoxy
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 2 | ||||
| -rw-r--r-- | avmedia/Library_avmediaogl.mk | 6 |
2 files changed, 2 insertions, 6 deletions
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: |