From e1c261746b376544921d6e253ac64496e0efe033 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Wed, 4 May 2016 09:01:16 +0900 Subject: [PATCH] [3.0] Fix common, wearable profile build errors at dali-1.1.22 version update This reverts commit da4a7c3eed00a4e0d72f212ddca7e127ba267fcd. Change-Id: I1da0885bc318599fa3b1d1c102d8c26ae76daff0 Signed-off-by: dongsug.song --- build/tizen/adaptor-uv/Makefile.am | 15 +++++++++++---- build/tizen/adaptor-uv/configure.ac | 13 ++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am index b6c5d52..15e2cf3 100644 --- a/build/tizen/adaptor-uv/Makefile.am +++ b/build/tizen/adaptor-uv/Makefile.am @@ -332,6 +332,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) \ @@ -350,10 +351,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) @@ -397,6 +394,16 @@ 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 + endif if USE_APPFW diff --git a/build/tizen/adaptor-uv/configure.ac b/build/tizen/adaptor-uv/configure.ac index e1919d1..ee79085 100644 --- a/build/tizen/adaptor-uv/configure.ac +++ b/build/tizen/adaptor-uv/configure.ac @@ -289,6 +289,12 @@ else if test "x$enable_profile" = "xMOBILE"; then PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland) fi +if test "x$enable_profile" = "xWEARABLE"; then +PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland) +fi +if test "x$enable_profile" = "xCOMMON"; then +PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland) +fi fi # Using Wayland API directly ( main loop agnostic, typically for running on libuv) @@ -301,13 +307,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) -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