summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiong Zhang <panda0626@gmail.com>2014-05-15 18:15:29 +0800
committerDavid Herrmann <dh.herrmann@gmail.com>2014-05-16 10:52:34 +0200
commit012be880fcb34d5c206bfbc9b00cd36e013aa2eb (patch)
treeed44e78993f58b812c1e5afbf401b9238407869e
parente507a14113eab3c2c4c34a977b237f505080bd2a (diff)
build: add libtsm to bbulk and gltex
text_bbulk.c and text_gltex.c contain text.h which depend on libtsm. Without adding tsm flags to compile option, bbulk and gltex can't be compiled. Signed-off-by: Xiong Zhang <panda0626@gmail.com> Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
-rw-r--r--Makefile.am9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index be2dc30..8f97c06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -415,7 +415,12 @@ mod_bbulk_la_SOURCES = \
src/kmscon_module_interface.h \
src/text_bbulk.c \
src/kmscon_mod_bbulk.c
-mod_bbulk_la_LIBADD = libshl.la
+mod_bbulk_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ $(TSM_CFLAGS)
+mod_bbulk_la_LIBADD = \
+ $(TSM_LIBS) \
+ libshl.la
mod_bbulk_la_LDFLAGS = \
$(AM_LDFLAGS) \
-module \
@@ -431,9 +436,11 @@ mod_gltex_la_SOURCES = \
src/kmscon_mod_gltex.c
mod_gltex_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
+ $(TSM_CFLAGS) \
$(GLES2_CFLAGS)
mod_gltex_la_LIBADD = \
$(GLES2_LIBS) \
+ $(TSM_LIBS) \
libshl.la \
src/text_gltex_atlas.vert.bin.lo \
src/text_gltex_atlas.frag.bin.lo