diff options
| author | Rob Clark <robclark@freedesktop.org> | 2016-05-14 11:59:26 -0400 |
|---|---|---|
| committer | Rob Clark <robclark@freedesktop.org> | 2016-05-25 16:31:15 -0400 |
| commit | 0f982bb67d64673f73096f7c536a5e29756c5c6f (patch) | |
| tree | 8ad48ef10dd666b090a5298dbe3e2cf5021a93a7 /src/compiler/Makefile.glsl.am | |
| parent | ec434d940d9ade664ed9ddf74760ce1dcc432718 (diff) | |
| download | external_mesa3d-0f982bb67d64673f73096f7c536a5e29756c5c6f.zip external_mesa3d-0f982bb67d64673f73096f7c536a5e29756c5c6f.tar.gz external_mesa3d-0f982bb67d64673f73096f7c536a5e29756c5c6f.tar.bz2 | |
glsl: split out libstandalone
Split standalone glsl_compiler into a libstandalone.la and a thin
main.cpp. This way drivers can re-use the glsl standalone frontend in
their own standalone compilers.
Signed-off-by: Rob Clark <robclark@freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/compiler/Makefile.glsl.am')
| -rw-r--r-- | src/compiler/Makefile.glsl.am | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index daf98f6..23c2a6b 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -57,7 +57,6 @@ glsl_tests_blob_test_LDADD = \ glsl/libglsl.la glsl_tests_general_ir_test_SOURCES = \ - glsl/standalone_scaffolding.cpp \ glsl/tests/builtin_variable_test.cpp \ glsl/tests/invalidate_locations_test.cpp \ glsl/tests/general_ir_test.cpp \ @@ -67,6 +66,7 @@ glsl_tests_general_ir_test_CFLAGS = \ glsl_tests_general_ir_test_LDADD = \ $(top_builddir)/src/gtest/libgtest.la \ glsl/libglsl.la \ + glsl/libstandalone.la \ $(top_builddir)/src/libglsl_util.la \ $(PTHREAD_LIBS) @@ -93,7 +93,7 @@ glsl_tests_sampler_types_test_LDADD = \ $(top_builddir)/src/libglsl_util.la \ $(PTHREAD_LIBS) -noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la +noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la glsl/libstandalone.la glsl_libglcpp_la_LIBADD = \ $(top_builddir)/src/util/libmesautil.la @@ -121,23 +121,29 @@ glsl_libglsl_la_SOURCES = \ $(LIBGLSL_FILES) -glsl_compiler_SOURCES = \ +glsl_libstandalone_la_SOURCES = \ $(GLSL_COMPILER_CXX_FILES) -glsl_compiler_LDADD = \ +glsl_libstandalone_la_LIBADD = \ glsl/libglsl.la \ $(top_builddir)/src/libglsl_util.la \ $(top_builddir)/src/util/libmesautil.la \ $(PTHREAD_LIBS) +glsl_compiler_SOURCES = \ + glsl/main.cpp + +glsl_compiler_LDADD = \ + glsl/libstandalone.la + glsl_glsl_test_SOURCES = \ - glsl/standalone_scaffolding.cpp \ glsl/test.cpp \ glsl/test_optpass.cpp \ glsl/test_optpass.h glsl_glsl_test_LDADD = \ glsl/libglsl.la \ + glsl/libstandalone.la \ $(top_builddir)/src/libglsl_util.la \ $(PTHREAD_LIBS) |