diff options
| author | Ian Romanick <[email protected]> | 2016-07-13 18:02:10 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2016-08-17 13:48:25 +0100 |
| commit | de71bc9eb6ebade3c48a42fef5d05023889fb2f8 (patch) | |
| tree | 38c379fd7b88e4d559a00d26d0f24cbdbaaf7782 | |
| parent | 120c9c6380e83e732bd105619d6303498ef4efb7 (diff) | |
glsl: Make the generated sources build rules more like NIR
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/compiler/Android.glsl.gen.mk | 2 | ||||
| -rw-r--r-- | src/compiler/Makefile.glsl.am | 4 | ||||
| -rw-r--r-- | src/compiler/Makefile.sources | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk index b2ea12cb4ab..157aa278b38 100644 --- a/src/compiler/Android.glsl.gen.mk +++ b/src/compiler/Android.glsl.gen.mk @@ -39,7 +39,7 @@ LOCAL_C_INCLUDES += \ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(LIBGLCPP_GENERATED_FILES) \ - $(LIBGLSL_GENERATED_CXX_FILES)) + $(LIBGLSL_GENERATED_FILES)) define local-l-or-ll-to-c-or-cpp @mkdir -p $(dir $@) diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index 4e90f16b4e9..bfb31613f33 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -116,9 +116,7 @@ glsl_libglsl_la_LIBADD = \ glsl/libglcpp.la glsl_libglsl_la_SOURCES = \ - glsl/glsl_lexer.cpp \ - glsl/glsl_parser.cpp \ - glsl/glsl_parser.h \ + $(LIBGLSL_GENERATED_FILES) \ $(LIBGLSL_FILES) diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index 0ff9b23e4c3..fcc34019d0d 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -144,9 +144,10 @@ GLSL_COMPILER_CXX_FILES = \ glsl/standalone.h # libglsl generated sources -LIBGLSL_GENERATED_CXX_FILES = \ +LIBGLSL_GENERATED_FILES = \ glsl/glsl_lexer.cpp \ - glsl/glsl_parser.cpp + glsl/glsl_parser.cpp \ + glsl/glsl_parser.h # libglcpp |