From 627d192385871e3d6b522341ecc762a6668af47f Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Fri, 24 Mar 2017 13:23:21 +0900 Subject: [PATCH] [3.0] Add Appcore Watch library in Makefile.am - Added APPCORE_WATCH_CFLAGS and APPCORE_WATCH_LIBS to WEARABLE_PROFILE in Makefile.am Change-Id: I41a5fb8ceb7d13fb39e7d5f554444c5bbc512437 Signed-off-by: Seoyeon Kim --- adaptors/wearable/watch/watch-time.cpp | 4 ++-- build/tizen/adaptor/Makefile.am | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/adaptors/wearable/watch/watch-time.cpp b/adaptors/wearable/watch/watch-time.cpp index df7b0f4..94377ad 100644 --- a/adaptors/wearable/watch/watch-time.cpp +++ b/adaptors/wearable/watch/watch-time.cpp @@ -20,8 +20,8 @@ // EXTERNAL INCLUDES #ifdef APPCORE_WATCH_AVAILABLE -#include -#include +#include +#include #endif namespace Dali diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 1479473..d83a694 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -433,7 +433,6 @@ libdali_adaptor_la_LIBADD = \ $(HARFBUZZ_LIBS) \ $(TPKP_CURL_LIBS) \ $(UTILX_LIBS) \ - $(APPCORE_WATCH_LIBS) \ -lgif \ -lpthread \ -lturbojpeg \ @@ -502,10 +501,12 @@ if WEARABLE_PROFILE libdali_adaptor_la_CXXFLAGS += \ $(HAPTIC_CFLAGS) \ $(EFL_ASSIST_CFLAGS) \ - $(SCREENCONNECTORPROVIDER_CFLAGS) + $(SCREENCONNECTORPROVIDER_CFLAGS) \ + $(APPCORE_WATCH_CFLAGS) libdali_adaptor_la_LIBADD += \ - $(SCREENCONNECTORPROVIDER_LIBS) + $(SCREENCONNECTORPROVIDER_LIBS) \ + $(APPCORE_WATCH_LIBS) endif if TV_PROFILE -- 2.7.4