diff options
author | Kristian Høgsberg Kristensen <[email protected]> | 2016-01-08 22:16:43 -0800 |
---|---|---|
committer | Kristian Høgsberg Kristensen <[email protected]> | 2016-01-08 22:16:43 -0800 |
commit | f0993f81c7fab4ceb99b010d8ee2facbf4fdc737 (patch) | |
tree | 2da8aeaa95a0337d9177f4d808837f7c5cbdbc25 /src/glsl/Makefile.am | |
parent | cfdc955fd5e1e965c458e50f4dc877653a463684 (diff) | |
parent | da5d4583e53fc9cdc86aba7d2ac770e01baa158d (diff) |
Merge ../mesa into vulkan
Diffstat (limited to 'src/glsl/Makefile.am')
-rw-r--r-- | src/glsl/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index 1396758b7c2..2e180a545ae 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -145,8 +145,8 @@ libglsl_la_SOURCES = \ $(LIBGLSL_FILES) \ $(NIR_FILES) \ $(SPIRV_FILES) \ - $(NIR_GENERATED_FILES) - + $(NIR_GENERATED_FILES) \ + $(GLSL_TO_NIR_FILES) libnir_la_SOURCES = \ $(NIR_FILES) \ |