summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Fonseca <[email protected]>2015-04-01 19:49:09 +0100
committerJose Fonseca <[email protected]>2015-04-01 19:49:09 +0100
commit3321724c10e2c9c5cd8f84bafb26678c6d1108b5 (patch)
tree79a7a89e16ca38708380fdac88c2b432366716e5
parent7f0682cebf8b100922d45a423df1e2fbd036bc3e (diff)
automake,scons: Put NIR source files in a separate var to fix SCons build.
SCons does not build NIR yet. Trivial.
-rw-r--r--src/gallium/auxiliary/Makefile.am1
-rw-r--r--src/gallium/auxiliary/Makefile.sources4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 36b84cfb610..89c7a13e913 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -22,6 +22,7 @@ AM_CXXFLAGS = \
libgallium_la_SOURCES = \
$(C_SOURCES) \
+ $(NIR_SOURCES) \
$(GENERATED_SOURCES)
if HAVE_MESA_LLVM
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 08e4e4c4f84..bd8e9499899 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -69,7 +69,6 @@ C_SOURCES := \
indices/u_indices_priv.h \
indices/u_primconvert.c \
indices/u_primconvert.h \
- nir/tgsi_to_nir.c \
os/os_memory_aligned.h \
os/os_memory_debug.h \
os/os_memory_stdc.h \
@@ -303,6 +302,9 @@ C_SOURCES := \
util/u_vbuf.h \
util/u_video.h
+NIR_SOURCES := \
+ nir/tgsi_to_nir.c
+
VL_SOURCES := \
vl/vl_compositor.c \
vl/vl_compositor.h \