X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=052d4fa6b726128702f8e6e1e48b6343b2a5b0e6;hb=666dc5f3ad56aefd7b856f3a2ce2c5e3a008bf7f;hp=d2fcfbc75c4a77315220529771783e8f9a5f4bc8;hpb=e23877df736bbe70ac93380dd9d01d7548d08cfd;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index d2fcfbc..052d4fa 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -94,10 +94,6 @@ 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
@@ -114,6 +110,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
@@ -189,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
@@ -214,10 +215,12 @@ 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_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
@@ -304,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
@@ -329,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
@@ -375,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 \
@@ -535,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)