diff options
| author | Eric Engestrom <[email protected]> | 2019-09-30 13:40:22 +0100 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-10-11 11:09:32 -0700 |
| commit | 7b70f2ec4758524d218609df0e79a4d58b7da8a4 (patch) | |
| tree | 61290a08790237e334193d222cc6f56d5d799d65 | |
| parent | f446e56d30ceb47ca9b434f2a8284210556b7c70 (diff) | |
meson: move a couple of include installs around
Preparation for a later commit.
Fixes: 93df862b6affb6b8507e ("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
(cherry picked from commit b9a5fb1f056d842811c2747fc3a836c16c3ded8a)
| -rw-r--r-- | include/meson.build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/meson.build b/include/meson.build index a2fbb73561a..d9b8df6ce52 100644 --- a/include/meson.build +++ b/include/meson.build @@ -22,6 +22,10 @@ inc_include = include_directories('.') inc_d3d9 = include_directories('D3D9') inc_haikugl = include_directories('HaikuGL') +if with_gles1 or with_gles2 or with_opengl or with_egl + install_headers('KHR/khrplatform.h', subdir : 'KHR') +endif + if with_gles1 install_headers( 'GLES/egl.h', 'GLES/gl.h', 'GLES/glext.h', 'GLES/glplatform.h', @@ -41,10 +45,6 @@ if with_gles2 ) endif -if with_gles1 or with_gles2 or with_opengl or with_egl - install_headers('KHR/khrplatform.h', subdir : 'KHR') -endif - if with_opengl install_headers( 'GL/gl.h', 'GL/glext.h', 'GL/glcorearb.h', @@ -56,10 +56,6 @@ if with_glx != 'disabled' install_headers('GL/glx.h', 'GL/glxext.h', subdir : 'GL') endif -if with_osmesa != 'none' - install_headers('GL/osmesa.h', subdir : 'GL') -endif - if with_egl install_headers( 'EGL/eglext.h', 'EGL/egl.h', 'EGL/eglextchromium.h', 'EGL/eglmesaext.h', @@ -68,6 +64,10 @@ if with_egl ) endif +if with_osmesa != 'none' + install_headers('GL/osmesa.h', subdir : 'GL') +endif + if with_dri install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal') endif |