X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=d83a6942721737f5568940764e31f4123c990a66;hb=refs%2Fchanges%2F53%2F120753%2F2;hp=0edd56e9f610a3d8ecf77238a26aa027cf56a51f;hpb=ffa5e92a476c2a67492f0f1a82ee6a5b47254fd5;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 0edd56e..d83a694 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -82,16 +82,18 @@ endif adaptor_mobile_dir = ../../../adaptors/mobile include ../../../adaptors/mobile/file.list +# WEARABLE +if WEARABLE_PROFILE +adaptor_wearable_dir = ../../../adaptors/wearable +include ../../../adaptors/wearable/file.list +endif + # TV if TV_PROFILE adaptor_tv_dir = ../../../adaptors/tv include ../../../adaptors/tv/file.list endif -# IVI -adaptor_mobile_dir = ../../../adaptors/mobile -include ../../../adaptors/mobile/file.list - # Public API adaptor_public_api_dir = ../../../adaptors/public-api include ../../../adaptors/public-api/file.list @@ -105,6 +107,12 @@ 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 + +static_libraries_image_resampler_src_dir = ../../../third-party/image-resampler +include ../../../third-party/image-resampler/file.list + # Package doc package_doxy_dir = ../../../doc include ../../../doc/file.list @@ -117,6 +125,13 @@ include ../../../doc/file.list if USE_EFL adaptor_internal_src_files = $(adaptor_tizen_framework_efl_src_files) \ $(adaptor_ecore_common_internal_src_files) + +if WAYLAND +adaptor_internal_src_files += $(adaptor_tizen_internal_indicator_src_files) +else +adaptor_internal_src_files += $(adaptor_ecore_common_internal_indicator_src_files) +endif + else adaptor_internal_src_files = $(adaptor_tizen_framework_libuv_src_files) endif @@ -180,10 +195,12 @@ adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) endif # USE_ECORE_WAYLAND adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ - $(adaptor_tizen_internal_native_image_src_files) + $(adaptor_tizen_internal_native_image_src_files) \ + $(adaptor_common_internal_wayland_mobile_profile_src_files) else adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ - $(adaptor_common_internal_egl_extension_src_files) + $(adaptor_common_internal_egl_extension_src_files) \ + $(adaptor_common_internal_x_mobile_profile_src_files) endif # WAYLAND endif # MOBILE_PROFILE @@ -204,10 +221,13 @@ adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) endif # USE_ECORE_WAYLAND adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ - $(adaptor_tizen_internal_native_image_src_files) + $(adaptor_tizen_internal_native_image_src_files) \ + $(adaptor_internal_wearable_profile_src_files) \ + $(adaptor_common_internal_wayland_mobile_profile_src_files) else adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ - $(adaptor_common_internal_egl_extension_src_files) + $(adaptor_common_internal_egl_extension_src_files) \ + $(adaptor_common_internal_x_mobile_profile_src_files) endif # WAYLAND endif # WEARABLE @@ -276,7 +296,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 @@ -291,7 +314,8 @@ libdali_adaptor_la_SOURCES = \ $(devel_api_src_files) \ $(public_api_src_files) \ $(adaptor_internal_src_files) \ - $(input_event_handler_src_files) + $(input_event_handler_src_files) \ + $(image_resampler_src_files) if ENABLE_NETWORK_LOGGING @@ -316,7 +340,8 @@ libdali_adaptor_la_includes = \ -I../../../adaptors/base/interfaces \ -I../../../adaptors/ \ -I../../../text \ - -I../../../text/dali/internal/libunibreak + -I../../../text/dali/internal/libunibreak \ + -I../../../third-party/image-resampler if WAYLAND libdali_adaptor_la_includes += -I../../../adaptors/integration-api/wayland @@ -327,7 +352,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 @@ -475,7 +500,13 @@ endif if WEARABLE_PROFILE libdali_adaptor_la_CXXFLAGS += \ $(HAPTIC_CFLAGS) \ - $(EFL_ASSIST_CFLAGS) + $(EFL_ASSIST_CFLAGS) \ + $(SCREENCONNECTORPROVIDER_CFLAGS) \ + $(APPCORE_WATCH_CFLAGS) + +libdali_adaptor_la_LIBADD += \ + $(SCREENCONNECTORPROVIDER_LIBS) \ + $(APPCORE_WATCH_LIBS) endif if TV_PROFILE @@ -521,6 +552,7 @@ tizenadaptorintegrationapi_HEADERS = $(adaptor_integration_api_header_files) if WAYLAND tizenadaptorintegrationwaylandapidir = $(devincludepath)/dali/integration-api/adaptors tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_wayland_api_header_files) +tizenadaptorintegrationwaylandapi_HEADERS += $(adaptor_integration_ecore_wayland_api_header_files) else tizenadaptorintegrationx11apidir = $(devincludepath)/dali/integration-api/adaptors tizenadaptorintegrationx11api_HEADERS = $(adaptor_integration_x11_api_header_files) @@ -547,6 +579,13 @@ endif # NOT UBUNTU_PROFILE tizenadaptordaliheaderdir = $(devincludepath)/dali tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file) +if WEARABLE_PROFILE +tizenadaptorpublicapi_HEADERS += $(adaptor_dali_wearable_header_file) + +tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch +tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files) +endif + install-data-local: $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir}