From 9be7487f3076b2470ca547e2d9d7d54492718090 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 7 Nov 2017 09:40:06 -0800 Subject: [PATCH] glapi: don't walk backwards for includes Instead just set the proper -I flags and include it from a more standard path. In this case we'll add -Isrc/mesa (which is common), and #include main/foo.h. Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/mapi/Makefile.am | 6 ++++-- src/mapi/glapi/tests/check_table.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am index 135e18aca1e..3da1a193d28 100644 --- a/src/mapi/Makefile.am +++ b/src/mapi/Makefile.am @@ -92,7 +92,8 @@ check_PROGRAMS += shared-glapi-test shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp shared_glapi_test_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/gtest/include + -I$(top_srcdir)/src/gtest/include \ + -I$(top_srcdir)/src/mesa shared_glapi_test_LDADD = \ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/gtest/libgtest.la @@ -154,7 +155,8 @@ check_PROGRAMS += glapi-test glapi_test_SOURCES = glapi/tests/check_table.cpp glapi_test_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/gtest/include + -I$(top_srcdir)/src/gtest/include \ + -I$(top_srcdir)/src/mesa glapi_test_LDADD = \ $(top_builddir)/src/mapi/glapi/libglapi.la \ diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp index 09bf4f3585c..62b3a43d22f 100644 --- a/src/mapi/glapi/tests/check_table.cpp +++ b/src/mapi/glapi/tests/check_table.cpp @@ -22,7 +22,7 @@ */ #include -#include "../mesa/main/glheader.h" +#include "main/glheader.h" extern "C" { #include "glapi/glapi.h" -- 2.30.2