projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vc4: Fix compiler warning from size_t change.
[mesa.git]
/
src
/
glsl
/
Makefile.am
diff --git
a/src/glsl/Makefile.am
b/src/glsl/Makefile.am
index ebea816b96df6c8cf5f044939485d4c5f942682a..33a34e4ccc8b50133a18d4d84c58ec6aa986ddea 100644
(file)
--- a/
src/glsl/Makefile.am
+++ b/
src/glsl/Makefile.am
@@
-96,6
+96,7
@@
tests_general_ir_test_CFLAGS = \
tests_general_ir_test_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
$(top_builddir)/src/glsl/libglsl.la \
tests_general_ir_test_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
$(top_builddir)/src/glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
$(PTHREAD_LIBS)
tests_uniform_initializer_test_SOURCES = \
$(PTHREAD_LIBS)
tests_uniform_initializer_test_SOURCES = \
@@
-108,6
+109,7
@@
tests_uniform_initializer_test_CFLAGS = \
tests_uniform_initializer_test_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
$(top_builddir)/src/glsl/libglsl.la \
tests_uniform_initializer_test_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
$(top_builddir)/src/glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
$(PTHREAD_LIBS)
tests_sampler_types_test_SOURCES = \
$(PTHREAD_LIBS)
tests_sampler_types_test_SOURCES = \
@@
-117,6
+119,7
@@
tests_sampler_types_test_CFLAGS = \
tests_sampler_types_test_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
$(top_builddir)/src/glsl/libglsl.la \
tests_sampler_types_test_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
$(top_builddir)/src/glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
$(PTHREAD_LIBS)
libglcpp_la_LIBADD = \
$(PTHREAD_LIBS)
libglcpp_la_LIBADD = \
@@
-131,6
+134,7
@@
glcpp_glcpp_SOURCES = \
glcpp/glcpp.c
glcpp_glcpp_LDADD = \
libglcpp.la \
glcpp/glcpp.c
glcpp_glcpp_LDADD = \
libglcpp.la \
+ $(top_builddir)/src/libglsl_util.la \
-lm
libglsl_la_LIBADD = libglcpp.la
-lm
libglsl_la_LIBADD = libglcpp.la
@@
-164,6
+168,7
@@
glsl_test_SOURCES = \
glsl_test_LDADD = \
libglsl.la \
glsl_test_LDADD = \
libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
$(PTHREAD_LIBS)
# We write our own rules for yacc and lex below. We'd rather use automake,
$(PTHREAD_LIBS)
# We write our own rules for yacc and lex below. We'd rather use automake,