Re-enable Color Emoji on platforms which have FreeType >= 2.0

Change-Id: I33451753d3bab2360a1a6834ad70d8509586ad2c

diff --git a/README b/README
index 2fe85e5..ceb23a6 100644 (file)
--- a/README
+++ b/README
@@ -24,10 +24,6 @@ T.O.C.
 
  gbs build -A [TARGET_ARCH] --spec dali-adaptor-mobile.spec
 
- Alternatively for latest devices:
-
- gbs build -A [TARGET_ARCH] --spec dali-adaptor-mobile.spec --define "TIZEN_SDK_2_3 1"
-
 1.3. WEARABLE Profile
 ---------------------
 

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 8d8cffb..c6c1ab4 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -315,7 +315,8 @@ libdali_adaptor_la_CXXFLAGS += \
                       $(DEVICED_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS) \
                       $(NATIVE_BUFFER_CFLAGS) \
-                      $(NATIVE_BUFFER_POOL_CFLAGS)
+                      $(NATIVE_BUFFER_POOL_CFLAGS) \
+                      -DFREETYPE_BITMAP_SUPPORT
 
 libdali_adaptor_la_LIBADD += \
                       $(EFL_ASSIST_LIBS) \
@@ -326,11 +327,13 @@ endif
 if WEARABLE_PROFILE
 libdali_adaptor_la_CXXFLAGS += \
                       $(HAPTIC_CFLAGS) \
-                      $(EFL_ASSIST_CFLAGS)
+                      $(EFL_ASSIST_CFLAGS) \
+                      -DFREETYPE_BITMAP_SUPPORT
 endif
 
 if TV_PROFILE
-libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
+libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS) \
+                               -DFREETYPE_BITMAP_SUPPORT
 libdali_adaptor_la_LIBADD +=
 endif
 
@@ -345,6 +348,10 @@ else
 libdali_adaptor_la_LIBADD += -ljpeg
 endif
 
+if UBUNTU_PROFILE
+libdali_adaptor_la_CXXFLAGS += -DFREETYPE_BITMAP_SUPPORT
+endif
+
 tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
 tizenadaptorpublicapi_HEADERS = $(public_api_header_files)