Signed-off-by: <dylan.c.ba...@intel.com>
---
include/meson.build | 1 +
src/glx/meson.build | 10 ++--------
src/glx/tests/meson.build | 4 ++--
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/include/meson.build b/include/meson.build
index e4dae91..9b34490 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -21,6 +21,7 @@
inc_drm_uapi = include_directories('drm-uapi')
inc_vulkan = include_directories('vulkan')
inc_d3d9 = include_directories('D3D9')
+inc_gl_internal = include_directories('GL/internal')
if with_gles1
install_headers(
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 7757eee..04cd647 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -138,10 +138,7 @@ endif
libglx = static_library(
'glx',
[files_libglx, glx_generated],
- include_directories : [
- inc_common, inc_glapi, inc_loader,
- include_directories('../../include/GL/internal'),
- ],
+ include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal],
c_args : [
c_vis_args, gl_lib_cargs,
'-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name,
gl_lib_version.split('.')[0]),
@@ -165,10 +162,7 @@ if with_glx == 'dri'
libgl = shared_library(
gl_lib_name,
dummy_c, # workaround for bug #2180
- include_directories : [
- inc_common, inc_glapi, inc_loader,
- include_directories('../../include/GL/internal'),
- ],
+ include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal],
link_with : [libglapi_static, libglapi],
link_whole : libglx,
link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl],
diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build
index fe0075a..fd9d4d4 100644
--- a/src/glx/tests/meson.build
+++ b/src/glx/tests/meson.build
@@ -40,8 +40,8 @@ if with_shared_glapi
[files_glx_test, glx_indirect_size_h, main_dispatch_h],
link_with : [libglx, libglapi],
include_directories : [
- include_directories('..', '../../../include/GL/internal'),
- inc_src, inc_include, inc_mesa, inc_mapi,
+ inc_src, inc_include, inc_mesa, inc_mapi, inc_gl_internal,
+ include_directories('..'),
],
dependencies : [dep_libdrm, dep_thread, idep_gtest]
)
--
git-series 0.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
