X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=052d4fa6b726128702f8e6e1e48b6343b2a5b0e6;hb=666dc5f3ad56aefd7b856f3a2ce2c5e3a008bf7f;hp=6bca851c50562df5d6c7829f4210d80cfcb4eba2;hpb=1b97f1d16a2b22c4c23a0c4898f26404b3760fc8;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 6bca851..052d4fa 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -82,6 +82,12 @@ 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 @@ -101,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 @@ -176,10 +188,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 @@ -200,10 +214,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 @@ -235,6 +252,33 @@ endif # WAYLAND endif +# IVI +if IVI_PROFILE + +adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ + $(adaptor_common_internal_mobile_profile_src_files) \ + $(adaptor_tizen_internal_src_files) \ + $(static_libraries_libunibreak_src_files) + +if WAYLAND + +if USE_ECORE_WAYLAND +adaptor_internal_src_files += $(adaptor_ecore_wayland_tizen_internal_src_files) +else +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) +else +adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) +endif # WAYLAND + +endif # IVI_PROFILE + + + # Node JS support for using an external libuv main loop. If not enabled then just use e-core as normal # Used for things like callbacks, file-monintors, x input handling if LIB_UV_EVENT_LOOP @@ -245,7 +289,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 @@ -260,7 +307,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 @@ -285,7 +333,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 @@ -296,7 +345,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 @@ -331,6 +380,7 @@ libdali_adaptor_la_CXXFLAGS = \ -DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \ -DFONT_APPLICATION_PATH="\"${fontApplicationPath}\"" \ -DFONT_CONFIGURATION_FILE="\"${fontConfigurationFile}\"" \ + -DTIZEN_PLATFORM_CONFIG_SUPPORTED=${tizenPlatformConfigSupported} \ -DNON_POWER_OF_TWO_TEXTURES \ -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ -Werror -Wall -lgcc \ @@ -377,6 +427,7 @@ libdali_adaptor_la_LIBADD = \ $(HARFBUZZ_LIBS) \ $(TPKP_CURL_LIBS) \ $(UTILX_LIBS) \ + $(APPCORE_WATCH_LIBS) \ -lgif \ -lpthread \ -lturbojpeg \ @@ -452,11 +503,33 @@ libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS) libdali_adaptor_la_LIBADD += endif +if IVI_PROFILE +libdali_adaptor_la_CXXFLAGS += \ + $(DEVICED_CFLAGS) \ + $(EFL_ASSIST_CFLAGS) \ + $(NATIVE_BUFFER_CFLAGS) \ + $(NATIVE_BUFFER_POOL_CFLAGS) + +libdali_adaptor_la_LIBADD += \ + $(EFL_ASSIST_LIBS) \ + $(NATIVE_BUFFER_LIBS) \ + $(NATIVE_BUFFER_POOL_LIBS) +endif + if UBUNTU_PROFILE libdali_adaptor_la_LIBADD += -ljpeg CFLAGS += -fPIC endif +if !UBUNTU_PROFILE +if WAYLAND +else +# X11 +libdali_adaptor_la_CXXFLAGS += $(UTILX_CFLAGS) +libdali_adaptor_la_LIBADD += $(UTILX_LIBS) +endif +endif + tizenadaptorpublicapidir = $(devincludepath)/dali/public-api tizenadaptorpublicapi_HEADERS = $(public_api_header_files) @@ -468,6 +541,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) @@ -494,6 +568,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}