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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/CppunitTest_vcl_bitmap_test.mk | 2 | ||||
| -rw-r--r-- | vcl/Executable_icontest.mk | 3 | ||||
| -rw-r--r-- | vcl/Executable_mtfdemo.mk | 1 | ||||
| -rw-r--r-- | vcl/Executable_ui-previewer.mk | 1 | ||||
| -rw-r--r-- | vcl/Executable_vcldemo.mk | 3 | ||||
| -rw-r--r-- | vcl/StaticLibrary_glxtest.mk | 1 |
6 files changed, 3 insertions, 8 deletions
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk index 33a0772695be..8e94d8b17b0e 100644 --- a/vcl/CppunitTest_vcl_bitmap_test.mk +++ b/vcl/CppunitTest_vcl_bitmap_test.mk @@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ boost_headers \ glew \ glm_headers \ - mesa_headers \ + $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \ )) $(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\ diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index e9a30f8a2076..aa15dfe998f0 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Executable_use_externals,icontest,\ boost_headers \ glew \ glm_headers \ - mesa_headers \ + $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \ )) $(eval $(call gb_Executable_use_api,icontest,\ @@ -29,7 +29,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,icontest,\ -lm $(DLOPEN_LIBS) \ -lpthread \ - -lGL \ -lX11 \ )) diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk index 01156f82296a..d637439a17ba 100644 --- a/vcl/Executable_mtfdemo.mk +++ b/vcl/Executable_mtfdemo.mk @@ -44,7 +44,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,mtfdemo,\ -lm $(DLOPEN_LIBS) \ -lpthread \ - -lGL \ -lX11 \ )) diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 4ef1b05c9fcb..0925e575ee67 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -38,7 +38,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,ui-previewer,\ -lm $(DLOPEN_LIBS) \ -lpthread \ - -lGL \ -lX11 \ )) diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index 3e05cf42200e..6c9c70c08657 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\ boost_headers \ glew \ glm_headers \ - mesa_headers \ + $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \ )) $(eval $(call gb_Executable_set_include,vcldemo,\ @@ -50,7 +50,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,vcldemo,\ -lm $(DLOPEN_LIBS) \ -lpthread \ - -lGL \ -lX11 \ )) diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk index 2ac2283897c4..6e90b2454f75 100644 --- a/vcl/StaticLibrary_glxtest.mk +++ b/vcl/StaticLibrary_glxtest.mk @@ -33,7 +33,6 @@ $(eval $(call gb_StaticLibrary_add_libs,glxtest,\ -lm \ -ldl \ -lpthread \ - -lGL \ -lX11 \ )) |