From c01ea14f22df7c50eff869cd7a195c56393acab5 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Wed, 10 Aug 2016 13:40:22 +0900 Subject: [PATCH] [3.0] Fix build errors in adaptor-uv by ecore wayland Change-Id: Iad3847b8a69b24d806b8dc6f67c10479d91ad85a --- build/tizen/adaptor-uv/Makefile.am | 17 ++++------------- build/tizen/adaptor-uv/configure.ac | 17 +++-------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am index 3c06074..d585921 100644 --- a/build/tizen/adaptor-uv/Makefile.am +++ b/build/tizen/adaptor-uv/Makefile.am @@ -358,6 +358,7 @@ libdali_adaptor_uv_la_CXXFLAGS = \ -DFONT_CONFIGURATION_FILE="\"${fontConfigurationFile}\"" \ -DNON_POWER_OF_TWO_TEXTURES \ -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ + -DWAYLAND_EXTENSIONS_SUPPORTED \ -Werror -Wall -lgcc \ $(libdali_adaptor_uv_la_includes) \ $(DALI_ADAPTOR_CFLAGS) \ @@ -376,11 +377,6 @@ 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_LIBADD = \ @@ -418,17 +414,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 diff --git a/build/tizen/adaptor-uv/configure.ac b/build/tizen/adaptor-uv/configure.ac index c2a125b..9dfe67b 100644 --- a/build/tizen/adaptor-uv/configure.ac +++ b/build/tizen/adaptor-uv/configure.ac @@ -289,13 +289,9 @@ fi else -# dali-adaptor-uv for MOBILE profile needs ecore-wayland even if enable_efl==no -# because adaptors/mobile/pixmap-render-surface-factory.cpp uses it. -if test "x$enable_profile" = "xMOBILE"; then -PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland) -fi - -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 @@ -310,13 +306,6 @@ PKG_CHECK_MODULES(WAYLAND, [ egl wayland-egl wayland-client >= 1.2.0 xkbcommon l fi 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 -- 2.7.4