diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:43 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:43 +0000 |
| commit | 98de1de8ddad1d22b4447d94745e4de28a6a8e99 (patch) | |
| tree | 54c237339a149068283cea45f3dbf821edb57cd4 /lib/mesa/src/gallium/tests | |
| parent | 4aae075c7789b61a4979f9841cf562a7bb2e6318 (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/gallium/tests')
| -rw-r--r-- | lib/mesa/src/gallium/tests/trivial/Makefile.am | 11 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/tests/unit/Makefile.am | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/mesa/src/gallium/tests/trivial/Makefile.am b/lib/mesa/src/gallium/tests/trivial/Makefile.am index db9a54ff0..56b7f3ffc 100644 --- a/lib/mesa/src/gallium/tests/trivial/Makefile.am +++ b/lib/mesa/src/gallium/tests/trivial/Makefile.am @@ -5,10 +5,17 @@ PIPE_SRC_DIR = $(top_builddir)/src/gallium/targets/pipe-loader AM_CFLAGS = \ $(GALLIUM_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys \ + -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \ + $(GALLIUM_PIPE_LOADER_DEFINES) + LDADD = \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ + $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) noinst_PROGRAMS = compute tri quad-tex @@ -19,7 +26,5 @@ tri_SOURCES = tri.c quad_tex_SOURCES = quad-tex.c -EXTRA_DIST = meson.build - clean-local: -rm -f result.bmp diff --git a/lib/mesa/src/gallium/tests/unit/Makefile.am b/lib/mesa/src/gallium/tests/unit/Makefile.am index 74d125fe4..c9bede75b 100644 --- a/lib/mesa/src/gallium/tests/unit/Makefile.am +++ b/lib/mesa/src/gallium/tests/unit/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/src/gallium/Automake.inc -EXTRA_DIST = SConscript meson.build +EXTRA_DIST = SConscript AM_CFLAGS = \ $(GALLIUM_CFLAGS) @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ LDADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ $(GALLIUM_COMMON_LIB_DEPS) |