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 /slideshow | |
| 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 'slideshow')
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 2 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 4c3340f34e7d..04b44e05019c 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ $(eval $(call gb_Library_use_externals,OGLTrans,\ boost_headers \ glew \ - mesa_headers \ + $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \ glm_headers \ )) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 5772afd1d37d..7d0e8150ed4d 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in $(eval $(call gb_Library_use_externals,slideshow,\ boost_headers \ glew \ - mesa_headers \ + $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \ )) $(eval $(call gb_Library_use_sdk_api,slideshow)) |