X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=4fbdc93452f4349c6c19aaa4e0e5d7a05d3afc4b;hb=e5e007e6bf30aecb18fdf1396309a8eb68395fc0;hp=81df29089920161d2182363e6651572c498fc7b0;hpb=221d74c1a3486cd1eb6097ecea751a03e3e8ee18;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 81df290..c153c5e 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -82,11 +82,13 @@ endif adaptor_mobile_dir = ../../../adaptors/mobile include ../../../adaptors/mobile/file.list +# WEARABLE +adaptor_wearable_dir = ../../../adaptors/wearable +include ../../../adaptors/wearable/file.list + # TV -if TV_PROFILE adaptor_tv_dir = ../../../adaptors/tv include ../../../adaptors/tv/file.list -endif # Public API adaptor_public_api_dir = ../../../adaptors/public-api @@ -104,6 +106,9 @@ 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 @@ -179,10 +184,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 @@ -203,10 +210,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 @@ -238,6 +248,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 @@ -266,7 +303,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 @@ -291,7 +329,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 @@ -337,9 +376,10 @@ 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 \ + -Werror -Wall -lgcc -Wold-style-cast\ $(libdali_adaptor_la_includes) \ $(DALI_ADAPTOR_CFLAGS) \ $(DALICORE_CFLAGS) \ @@ -364,7 +404,10 @@ if !COMMON_PROFILE libdali_adaptor_la_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED endif -libdali_adaptor_la_CFLAGS = $(libdali_adaptor_la_CXXFLAGS) +libdali_adaptor_la_CFLAGS = \ + -Werror -Wall \ + -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ + $(DALI_ADAPTOR_CFLAGS) libdali_adaptor_la_LIBADD = \ $(DALICORE_LIBS) \ @@ -450,7 +493,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 @@ -458,11 +507,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) @@ -474,6 +545,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) @@ -500,6 +572,11 @@ endif # NOT UBUNTU_PROFILE tizenadaptordaliheaderdir = $(devincludepath)/dali tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file) +tizenadaptorpublicapi_HEADERS += $(adaptor_dali_wearable_header_file) + +tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch +tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files) + install-data-local: $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir}