From 06c667556045bd9542ad5e6a318f42dd66707bd4 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 20 Oct 2017 22:23:15 -0700 Subject: [PATCH] meson: move gallium include declarations to src These are used by non-gallium osmesa, so they need to be defined outside of the gallium subdirectory. Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom --- src/gallium/auxiliary/meson.build | 2 -- src/gallium/meson.build | 1 - src/meson.build | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 778b4ce4ac2..bb7c0506d84 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -18,8 +18,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -inc_gallium_aux = include_directories('.') - files_libgallium = files( 'cso_cache/cso_cache.c', 'cso_cache/cso_cache.h', diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 570c37e6475..e0941103b93 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -18,7 +18,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -inc_gallium = include_directories('include') inc_gallium_drivers = include_directories('drivers') inc_gallium_winsys = include_directories('winsys') diff --git a/src/meson.build b/src/meson.build index f980d25b7dd..6dc9abeb0bd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -23,6 +23,8 @@ inc_common = include_directories( inc_mesa = include_directories('mesa') inc_mapi = include_directories('mapi') inc_src = include_directories('.') +inc_gallium = include_directories('gallium/include') +inc_gallium_aux = include_directories('gallium/auxiliary') libglsl_util = static_library( 'glsl_util', -- 2.30.2