From b216cc1b8096eb60c27f67e8c27b7cd756c75e38 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 12 Nov 2015 01:13:01 +0200 Subject: 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 --- avmedia/Library_avmedia.mk | 2 +- avmedia/Library_avmediaogl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'avmedia') 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,\ -- cgit v1.2.3