X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor-uv%2FMakefile.am;h=0448d7b80b9ae03787de8d44b2bd3ded71cf0c87;hb=7ab5a74d00a11e05ba7b726ae1158ece5f085ed5;hp=3c0607477b41480dcb510de61d2def9002f7deb9;hpb=7b7460fa96d85069304425510818e9ab5a9bc014;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am
old mode 100644
new mode 100755
index 3c06074..0448d7b
--- a/build/tizen/adaptor-uv/Makefile.am
+++ b/build/tizen/adaptor-uv/Makefile.am
@@ -73,10 +73,15 @@ 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
@@ -101,6 +106,9 @@ include ../../../adaptors/devel-api/file.list
 static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
 include ../../../text/dali/internal/libunibreak/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
@@ -284,7 +292,8 @@ libdali_adaptor_uv_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
@@ -309,7 +318,8 @@ libdali_adaptor_uv_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_uv_la_includes += -I../../../adaptors/integration-api/wayland
@@ -356,8 +366,10 @@ libdali_adaptor_uv_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 \
+                      -DWAYLAND_EXTENSIONS_SUPPORTED \
                       -Werror -Wall -lgcc \
                       $(libdali_adaptor_uv_la_includes) \
                       $(DALI_ADAPTOR_CFLAGS) \
@@ -381,7 +393,10 @@ if !COMMON_PROFILE
 libdali_adaptor_uv_la_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED
 endif
 
-libdali_adaptor_uv_la_CFLAGS = $(libdali_adaptor_uv_la_CXXFLAGS)
+libdali_adaptor_uv_la_CFLAGS = \
+                      -Werror -Wall \
+                      -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
+                      $(DALI_ADAPTOR_CFLAGS)
 
 libdali_adaptor_uv_la_LIBADD = \
                       $(DALICORE_LIBS) \
@@ -418,17 +433,12 @@ libdali_adaptor_uv_la_LIBADD += $(ELEMENTARY_LIBS) \
 
 else
 
-if MOBILE_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
-
-if IVI_PROFILE
+if !UBUNTU_PROFILE
 libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
 libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
+endif # !UBUNTU_PROFILE
 
-endif
+endif # USE_EFL
 
 if USE_APPFW
 
@@ -443,8 +453,18 @@ libdali_adaptor_uv_la_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
                              $(CAPI_SYSTEM_INFO_LIBS) \
                              $(TTS_LIBS) \
                              $(CAPI_SYSTEM_SENSOR_LIBS)
+if USE_APPFW_EFL_BASE
+else
+libdali_adaptor_uv_la_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \
+                                  $(CAPI_APPFW_CONTROL_CFLAGS) \
+                                  $(FRIBIDI_CFLAGS)
 
+libdali_adaptor_uv_la_LIBADD += $(CAPI_APPFW_COMMON_LIBSS) \
+                                $(CAPI_APPFW_CONTROL_LIBSS) \
+                                $(FRIBIDI_LIBS)
 endif
+endif
+
 if WAYLAND
 # This is to avoid having to include wayland-egl.h everywhere
 libdali_adaptor_uv_la_CXXFLAGS += -DWL_EGL_PLATFORM