diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-11-12 01:13:01 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-12 01:30:08 +0200 |
| commit | b216cc1b8096eb60c27f67e8c27b7cd756c75e38 (patch) | |
| tree | 261cc276957765f88dc0d618e90a7608bbaae166 /avmedia | |
| parent | 318c3a48c66dd4ceba801ef410f89b8bf900d5c7 (diff) | |
Avoid mesa_headers on X11, also link with -lGL only where necesssary
The GLEW headers are enough, and what we actually use in these
places. In addition to handling GL extension things in its dynamic
fashion, GLEW headers also have declarations for standard,
non-extension, OpenGL API, including xgl and wgl ones.
Most likely we don't need mesa_headers on Windows or OS X either, and
can drop them completely.
Change-Id: Ic0d8d6238c862f8fe4a74e99e95344dcbf540980
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 2 | ||||
| -rw-r--r-- | avmedia/Library_avmediaogl.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index ec70670487ce..f922486750cb 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Library_add_defs,avmedia,\ $(eval $(call gb_Library_use_externals,avmedia,\ boost_headers \ glew \ - mesa_headers \ + $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \ )) $(eval $(call gb_Library_use_libraries,avmedia,\ diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index 3ff981811846..117e8965c2e5 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_use_externals,avmediaogl, \ libgltf \ glew \ glm_headers \ - mesa_headers \ + $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \ )) $(eval $(call gb_Library_use_libraries,avmediaogl,\ |