summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-11-20 14:54:30 -0800
committerDylan Baker <[email protected]>2018-02-06 15:00:17 -0800
commit002fbde71eb411521bdceb6dde772c6e21df0f1e (patch)
tree1ac68844b8538b41783262658e1635b6a28e19c7
parentaac3d0117850a40b89aacfa11924476dbe16983d (diff)
glapi: Don't search through subdirs from glapitable.h
Because meson won't put it in that folder. Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--src/mapi/glapi/tests/check_table.cpp2
-rw-r--r--src/mesa/main/tests/Makefile.am2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index 30f523ca5fb..6230f1273f3 100644
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -25,7 +25,7 @@
#include "main/glheader.h"
#include "glapi/glapi.h"
-#include "glapi/glapitable.h"
+#include "glapitable.h"
struct name_offset {
const char *name;
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index a8395d925bd..94266a1d4ab 100644
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gtest/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
+ -I$(top_builddir)/src/mapi/glapi \
+ -I$(top_srcdir)/src/mapi/glapi \
-I$(top_builddir)/src/mesa \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/include \