Change-Id: I170bc472cc3f8d361d280eeed7577bbd1f78900f
-DTIZEN_PLATFORM_CONFIG_SUPPORTED=${tizenPlatformConfigSupported} \
-DNON_POWER_OF_TWO_TEXTURES \
-DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
-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) \
-Werror -Wall -lgcc \
$(libdali_adaptor_uv_la_includes) \
$(DALI_ADAPTOR_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(TPKP_CURL_CFLAGS)
$(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_LIBADD = \
libdali_adaptor_uv_la_CFLAGS = $(libdali_adaptor_uv_la_CXXFLAGS)
libdali_adaptor_uv_la_LIBADD = \
libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-if IVI_PROFILE
-libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS)
-libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS)
-endif
-
-endif
-# For adaptors/mobile/native-render-surface-factory.cpp
-PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
-
-if test "x$enable_profile" = "xIVI"; then
+# dali-adaptor-uv needs ecore-wayland even if enable_efl==no
+# because NativeRenderSurface uses it.
+if test "x$enable_profile" != "xUBUNTU"; then
PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
fi
PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
fi
-# remove this when we update common repos
-# common profile currently does not have wayland extensions like xdg-shell
-if test "x$enable_wayland" = "xyes"; then
-if test "x$enable_profile" != "xCOMMON"; then
-PKG_CHECK_MODULES(WAYLAND_EXTENSION, xdg-shell-client text-client input-method-client)
-fi
-fi
AM_CONDITIONAL([USE_ECORE_WAYLAND], [test "$DALI_USE_ECORE_WAYLAND" -eq 1])
if test x$DALI_DATA_RW_DIR != x; then
AM_CONDITIONAL([USE_ECORE_WAYLAND], [test "$DALI_USE_ECORE_WAYLAND" -eq 1])
if test x$DALI_DATA_RW_DIR != x; then