Commit fc48ad24 authored by Dylan Baker's avatar Dylan Baker

make: Fix test to be meson compatible

This has the same problem as the previous commit, generated headers and
hardcoded paths.
Signed-off-by: default avatarDylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent 1b1bb6ee
...@@ -85,6 +85,7 @@ check_PROGRAMS += shared-glapi-test ...@@ -85,6 +85,7 @@ check_PROGRAMS += shared-glapi-test
shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp
shared_glapi_test_CPPFLAGS = \ shared_glapi_test_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/gtest/include -I$(top_srcdir)/src/gtest/include
shared_glapi_test_LDADD = \ shared_glapi_test_LDADD = \
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
...@@ -148,6 +149,7 @@ check_PROGRAMS += glapi-test ...@@ -148,6 +149,7 @@ check_PROGRAMS += glapi-test
glapi_test_SOURCES = glapi/tests/check_table.cpp glapi_test_SOURCES = glapi/tests/check_table.cpp
glapi_test_CPPFLAGS = \ glapi_test_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/gtest/include -I$(top_srcdir)/src/gtest/include
glapi_test_LDADD = \ glapi_test_LDADD = \
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "../../../mesa/main/glheader.h" #include "../../../mesa/main/glheader.h"
#include "glapi/glapi.h" #include "glapi/glapi.h"
#include "glapi/glapitable.h" #include "glapitable.h"
struct name_offset { struct name_offset {
const char *name; const char *name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment