Revert "[Tizen] Fix build errors in adaptor-uv by ecore wayland"

[platform/core/uifw/dali-adaptor.git] / build / tizen / adaptor-uv / Makefile.am

diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am
index c4f9ee7..07d093f 100644 (file)
--- a/build/tizen/adaptor-uv/Makefile.am
+++ b/build/tizen/adaptor-uv/Makefile.am
@@ -88,10 +88,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
@@ -105,6 +101,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
@@ -288,7 +287,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
@@ -313,7 +313,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
@@ -360,9 +361,9 @@ 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,8 +382,15 @@ libdali_adaptor_uv_la_CXXFLAGS = \
                       $(LIBCURL_CFLAGS) \
                       $(TPKP_CURL_CFLAGS)
 
+# Todo, as soon as common repos are updated on build server remove this.
+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) \
@@ -419,20 +427,8 @@ 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 WEARABLE_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
-
-if COMMON_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
 
 if IVI_PROFILE
 libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)