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 <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Dylan Baker 2017-10-20 22:23:15 -07:00
parent 63c360d7b2
commit 06c6675560
3 changed files with 2 additions and 3 deletions

View File

@ -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',

View File

@ -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')

View File

@ -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',