X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=02a047c31895ea6f076a4d9a0a43d200d3f2f4e0;hb=432903d1924bdcfa913f09d70ca0ae3a4e351564;hp=a23c7c47eb2ef4fb9aeb976009cbb98f6f2c2c71;hpb=5c7f2d3b0b4a5cff0733c23e3095c297b8b28ee6;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index a23c7c4..02a047c 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2014 Samsung Electronics Co., Ltd. +# Copyright (c) 2017 Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,29 +40,16 @@ include ../../../adaptors/integration-api/file.list adaptor_common_dir = ../../../adaptors/common include ../../../adaptors/common/file.list -if USE_EFL # ECore Common adaptor_ecore_common_dir = ../../../adaptors/ecore/common include ../../../adaptors/ecore/common/file.list -else -# If we're not using any EFL, then we need to use libuv mainloop -# for the frame work -adaptor_libuv_dir = ../../../adaptors/libuv -include ../../../adaptors/libuv/file.list -endif # Wayland if WAYLAND -if USE_EFL ## Use ecore_wayland adaptor_ecore_wayland_dir = ../../../adaptors/ecore/wayland include ../../../adaptors/ecore/wayland/file.list else -## Use wayland -adaptor_wayland_dir = ../../../adaptors/wayland -include ../../../adaptors/wayland/file.list -endif -else # X11 adaptor_x11_dir = ../../../adaptors/x11 include ../../../adaptors/x11/file.list @@ -73,20 +60,27 @@ if UBUNTU_PROFILE adaptor_ubuntu_dir = ../../../adaptors/ubuntu include ../../../adaptors/ubuntu/file.list else + # Tizen adaptor_tizen_dir = ../../../adaptors/tizen +if USE_APPFW_EFL_BASE +include ../../../adaptors/tizen/file-3.list +else include ../../../adaptors/tizen/file.list endif +endif # Mobile 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 @@ -101,21 +95,19 @@ 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 ############# source files ############# - -# FRAMEWORK FILES for adaptor -# Either use ecore mainloop + appcore / uiman -# Or libuv main loop with no appcore / uimain -if USE_EFL adaptor_internal_src_files = $(adaptor_tizen_framework_efl_src_files) \ $(adaptor_ecore_common_internal_src_files) -else -adaptor_internal_src_files = $(adaptor_tizen_framework_libuv_src_files) -endif # COMMON if COMMON_PROFILE @@ -127,14 +119,19 @@ adaptor_internal_src_files += $(adaptor_common_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) \ $(adaptor_ecore_wayland_internal_default_profile_src_files) else adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) -endif +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) \ $(adaptor_x11_internal_default_profile_src_files) endif # WAYLAND endif # COMMON_PROFILE @@ -148,7 +145,8 @@ adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ $(adaptor_ubuntu_internal_src_files) \ $(adaptor_x11_ubuntu_internal_src_files) \ $(adaptor_x11_internal_default_profile_src_files) \ - $(static_libraries_libunibreak_src_files) + $(static_libraries_libunibreak_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) endif # UBUNTU_PROFILE @@ -162,13 +160,20 @@ adaptor_internal_src_files += $(adaptor_common_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 +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_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_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) \ + $(adaptor_common_internal_x_mobile_profile_src_files) endif # WAYLAND endif # MOBILE_PROFILE @@ -181,13 +186,21 @@ adaptor_internal_src_files += $(adaptor_common_internal_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 +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_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_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) \ + $(adaptor_common_internal_x_mobile_profile_src_files) endif # WAYLAND endif # WEARABLE @@ -202,32 +215,58 @@ adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ $(adaptor_tizen_internal_non_mobile_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 +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_tv_internal_src_files) \ - $(adaptor_x11_internal_tv_profile_key_src_files) + $(adaptor_x11_internal_tv_profile_key_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) endif # WAYLAND endif -# 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 -main_loop_integration_src_files = $(adaptor_common_internal_uv_src_files) -input_event_handler_src_files = $(adaptor_uv_x_event_handler_internal_src_files) +# 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 + 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-integration.pc +pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc lib_LTLIBRARIES = libdali-adaptor.la @@ -239,7 +278,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 @@ -264,26 +304,30 @@ 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 + if USE_ECORE_WAYLAND libdali_adaptor_la_includes += \ -I../../../adaptors/ecore/common \ -I../../../adaptors/ecore/wayland else libdali_adaptor_la_includes += -I../../../adaptors/wayland \ - -I../../../adaptors/wayland/imf \ - -I../../../adaptors/wayland/clipboard \ - -I../../../adaptors/wayland/native-image -endif + -I../../../adaptors/wayland/input/text/imf \ + -I../../../adaptors/wayland/clipboard +endif # USE_ECORE_WAYLADN + +libdali_adaptor_la_includes += \ + -I../../../adaptors/tizen else libdali_adaptor_la_includes += \ -I../../../adaptors/ecore/common \ -I../../../adaptors/x11 \ -I../../../adaptors/integration-api/x11 -endif +endif # WAYLAND if UBUNTU_PROFILE libdali_adaptor_la_includes += \ @@ -307,9 +351,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) \ @@ -322,16 +367,22 @@ libdali_adaptor_la_CXXFLAGS = \ $(EXIF_CFLAGS) \ $(MMFSOUND_CFLAGS) \ $(TTS_CFLAGS) \ + $(CAPI_SYSTEM_SENSOR_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(LIBEXIF_CFLAGS) \ - $(LIBCURL_CFLAGS) + $(LIBCURL_CFLAGS) \ + $(TPKP_CURL_CFLAGS) \ + $(UTILX_CFLAGS) # Todo, as soon as common repos are updated on build server remove this. 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) \ @@ -343,30 +394,30 @@ libdali_adaptor_la_LIBADD = \ $(VCONF_LIBS) \ $(EXIF_LIBS) \ $(TTS_LIBS) \ + $(CAPI_SYSTEM_SENSOR_LIBS) \ $(LIBDRM_LIBS) \ $(LIBEXIF_LIBS) \ $(LIBCURL_LIBS) \ $(HARFBUZZ_LIBS) \ + $(TPKP_CURL_LIBS) \ + $(UTILX_LIBS) \ -lgif \ -lpthread \ - -lturbojpeg + -lturbojpeg \ + -ljpeg -if USE_EFL # EVAS used indicator libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS) \ $(EVAS_CFLAGS) \ $(ECORE_CFLAGS) \ $(ECORE_IPC_CFLAGS) \ - $(ELDBUS_CFLAGS) \ - -DUSE_EFL + $(ELDBUS_CFLAGS) libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS) \ $(ECORE_IPC_LIBS) \ $(ELDBUS_LIBS) -endif - if USE_APPFW libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \ @@ -380,8 +431,18 @@ libdali_adaptor_la_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ $(CAPI_SYSTEM_INFO_LIBS) \ $(TTS_LIBS) \ $(SENSOR_LIBS) +if USE_APPFW_EFL_BASE +else +libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \ + $(CAPI_APPFW_CONTROL_CFLAGS) \ + $(FRIBIDI_CFLAGS) +libdali_adaptor_la_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \ + $(CAPI_APPFW_CONTROL_LIBS) \ + $(FRIBIDI_LIBS) endif +endif + if WAYLAND # This is to avoid having to include wayland-egl.h everywhere libdali_adaptor_la_CXXFLAGS += -DWL_EGL_PLATFORM @@ -413,7 +474,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 @@ -421,6 +488,19 @@ 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 @@ -437,6 +517,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) @@ -452,6 +533,7 @@ tizentextabstractiondevelapidir = $(tizenadaptordevelapidir)/text-abstraction tizentextabstractiondevelapi_HEADERS = $(text_abstraction_header_files) if !UBUNTU_PROFILE +tizenadaptorframeworkpublicapi_HEADERS += $(public_api_adaptor_tizen_header_files) if !WAYLAND tizenadaptorframeworkdevelapi_HEADERS += $(devel_api_adaptor_tizen_x11_header_files) @@ -462,6 +544,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} @@ -473,12 +560,7 @@ packagedoxydir = $(devincludepath)/dali/doc packagedoxy_HEADERS = $(package_doxy_files) # linking test - -# turn off the linker test if were building for libuv -# We can't link to LibUV becase it is statically linked to Node.JS (by default) -if !LIB_UV_EVENT_LOOP noinst_PROGRAMS = linker.test -endif # NOT LIB_UV_EVENT_LOOP linker_test_SOURCES = linker-test.cpp