Merge "Remove ImageActor from ObjectProfiler and Emscripten" into devel/master

[platform/core/uifw/dali-adaptor.git] / build / tizen / adaptor / Makefile.am

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 9ae51dd..81df290 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -101,6 +101,9 @@ include ../../../adaptors/devel-api/file.list
 static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
 include ../../../text/dali/internal/libunibreak/file.list
 
+static_libraries_glyphy_src_dir = ../../../text/dali/internal/glyphy
+include ../../../text/dali/internal/glyphy/file.list
+
 # Package doc
 package_doxy_dir = ../../../doc
 include ../../../doc/file.list
@@ -245,7 +248,10 @@ main_loop_integration_src_files = $(adaptor_common_internal_ecore_src_files)
 input_event_handler_src_files = $(adaptor_ecore_x_event_handler_internal_src_files)
 endif
 
-
+if ENABLE_VECTOR_BASED_TEXT_RENDERING
+adaptor_internal_src_files += $(static_libraries_glyphy_src_files)
+DALI_ADAPTOR_CFLAGS += -DENABLE_VECTOR_BASED_TEXT_RENDERING
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc
@@ -296,7 +302,7 @@ libdali_adaptor_la_includes += \
                       -I../../../adaptors/ecore/wayland
 else
 libdali_adaptor_la_includes += -I../../../adaptors/wayland \
-                               -I../../../adaptors/wayland/imf \
+                               -I../../../adaptors/wayland/input/text/imf \
                                -I../../../adaptors/wayland/clipboard
 endif # USE_ECORE_WAYLADN
 
@@ -346,6 +352,7 @@ libdali_adaptor_la_CXXFLAGS = \
                       $(EXIF_CFLAGS) \
                       $(MMFSOUND_CFLAGS) \
                       $(TTS_CFLAGS) \
+                      $(CAPI_SYSTEM_SENSOR_CFLAGS) \
                       $(LIBDRM_CFLAGS) \
                       $(LIBEXIF_CFLAGS) \
                       $(LIBCURL_CFLAGS) \
@@ -369,6 +376,7 @@ libdali_adaptor_la_LIBADD = \
                       $(VCONF_LIBS) \
                       $(EXIF_LIBS) \
                       $(TTS_LIBS) \
+                      $(CAPI_SYSTEM_SENSOR_LIBS) \
                       $(LIBDRM_LIBS) \
                       $(LIBEXIF_LIBS) \
                       $(LIBCURL_LIBS) \