X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=build%2Ftizen%2Fdeps-check.cmake;h=371d8ea140b6964fe4dade33b55ba34df44d1f89;hb=3302173bf1d52c1c68b35da38fce7b2a2c8046bd;hp=87cd5116d5c989b303a1ec6f1609d0d50f9a1a47;hpb=54de04b8698bcafee7f8dc623d19a30fc006de0b;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index 87cd511..371d8ea 100644
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -42,7 +42,7 @@ IF( NOT enable_profile )
 ENDIF()
 
 # Test for profile and exit if something wrong
-SET( VALID_PROFILES COMMON MOBILE WEARABLE TV IVI UBUNTU ANDROID )
+SET( VALID_PROFILES COMMON MOBILE WEARABLE TV IVI UBUNTU ANDROID WINDOWS )
 LIST( FIND VALID_PROFILES ${enable_profile} RESULT )
 IF( RESULT EQUAL -1 )
   MESSAGE( FATAL_ERROR "Invalid profile!" )
@@ -66,6 +66,8 @@ CHECK_MODULE_AND_SET( FREETYPE freetype2>=${FREETYPE_REQUIRED} freetype_availabl
 CHECK_MODULE_AND_SET( FREETYPE_BITMAP_SUPPORT freetype2>=${FREETYPE_BITMAP_SUPPORT_VERSION} freetype_bitmap_support)
 CHECK_MODULE_AND_SET( FONTCONFIG fontconfig fontconfig_available )
 CHECK_MODULE_AND_SET( PNG libpng [] )
+CHECK_MODULE_AND_SET( WEBP libwebp webp_available )
+CHECK_MODULE_AND_SET( WEBP_DEMUX libwebpdemux [] )
 CHECK_MODULE_AND_SET( LIBEXIF libexif [] )
 CHECK_MODULE_AND_SET( LIBDRM libdrm [] )
 CHECK_MODULE_AND_SET( LIBCURL libcurl [] )
@@ -78,7 +80,6 @@ CHECK_MODULE_AND_SET( ECORE ecore [] )
 CHECK_MODULE_AND_SET( ECORE_IPC ecore-ipc [] )
 CHECK_MODULE_AND_SET( ECORE_IMF ecore-imf [] )
 CHECK_MODULE_AND_SET( ELDBUS eldbus eldbus_available )
-CHECK_MODULE_AND_SET( TPKP_CURL tpkp-curl tpkp_curl_available )
 CHECK_MODULE_AND_SET( UTILX utilX utilx_available )
 CHECK_MODULE_AND_SET( OPENGLES20 glesv2 [] )
 CHECK_MODULE_AND_SET( EGL egl [] )
@@ -90,6 +91,7 @@ CHECK_MODULE_AND_SET( CAPI_SYSTEM_INFO capi-system-info [] )
 CHECK_MODULE_AND_SET( CAPI_SYSTEM_SENSOR capi-system-sensor capi_system_sensor_support )
 CHECK_MODULE_AND_SET( CAPI_SYSTEM_SYSTEM_SETTINGS capi-system-system-settings [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_APPLICATION capi-appfw-application [] )
+CHECK_MODULE_AND_SET( COMPONENT_BASED_CORE_BASE component-based-core-base [] )
 
 CHECK_MODULE_AND_SET( ELEMENTARY elementary [] )
 CHECK_MODULE_AND_SET( BUNDLE bundle [] )
@@ -102,7 +104,7 @@ CHECK_MODULE_AND_SET( CAPI_APPFW_WIDGET_BASE appcore-widget-base [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_COMMON capi-appfw-app-common [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_CONTROL capi-appfw-app-control [] )
 
-CHECK_MODULE_AND_SET( DALICORE dali-core [] )
+CHECK_MODULE_AND_SET( DALICORE dali2-core [] )
 
 IF( ANDROID_PROFILE )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK} )
@@ -137,8 +139,9 @@ IF( eldbus_available )
   ADD_DEFINITIONS( -DDALI_ELDBUS_AVAILABLE )
 ENDIF()
 
-IF( tpkp_curl_available )
-  ADD_DEFINITIONS( -DTPK_CURL_ENABLED )
+IF( webp_available )
+  SET(DALI_WEBP_AVAILABLE 1)
+  ADD_DEFINITIONS( -DDALI_WEBP_AVAILABLE )
 ENDIF()
 
 ADD_DEFINITIONS( -DPLATFORM_TIZEN )
@@ -216,13 +219,18 @@ ELSE()
   SET( cachePath /home/owner )
 ENDIF()
 
+IF( enable_appfw )
+  ADD_DEFINITIONS( -DUSE_APPFW -DCOMPONENT_APPLICATION_SUPPORT)
+ENDIF()
+
 #######################################################
 
 ADD_DEFINITIONS( -DDALI_PROFILE_${enable_profile})
 SET( DALI_PROFILE_CFLAGS -DDALI_PROFILE_${enable_profile} )
 
 # Platforms with highp shader support can use vector based text
-CONDITIONAL( ENABLE_VECTOR_BASED_TEXT_RENDERING UBUNTU_PROFILE )
+ADD_DEFINITIONS( "-DENABLE_VECTOR_BASED_TEXT_RENDERING" )
+
 CONDITIONAL( WAYLAND enable_wayland )
 
 # set lowercase profile name
@@ -239,6 +247,8 @@ SET( DALI_CFLAGS
   ${FONTCONFIG_CFLAGS}
   ${CAIRO_CFLAGS}
   ${PNG_CFLAGS}
+  ${WEBP_CFLAGS}
+  ${WEBP_DEMUX_CFLAGS}
   ${DLOG_CFLAGS}
   ${VCONF_CFLAGS}
   ${EXIF_CFLAGS}
@@ -248,7 +258,6 @@ SET( DALI_CFLAGS
   ${LIBDRM_CFLAGS}
   ${LIBEXIF_CFLAGS}
   ${LIBCURL_CFLAGS}
-  ${TPKP_CURL_CFLAGS}
   ${UTILX_CFLAGS}
   -Wall
 )
@@ -261,6 +270,8 @@ SET( DALI_LDFLAGS
   ${FONTCONFIG_LDFLAGS}
   ${CAIRO_LDFLAGS}
   ${PNG_LDFLAGS}
+  ${WEBP_LDFLAGS}
+  ${WEBP_DEMUX_LDFLAGS}
   ${DLOG_LDFLAGS}
   ${VCONF_LDFLAGS}
   ${EXIF_LDFLAGS}
@@ -271,7 +282,6 @@ SET( DALI_LDFLAGS
   ${LIBCURL_LDFLAGS}
   ${LIBCRYPTO_LDFLAGS}
   ${HARFBUZZ_LDFLAGS}
-  ${TPKP_CURL_LDFLAGS}
   ${UTILX_LDFLAGS}
   -lgif
   -lturbojpeg
@@ -337,6 +347,7 @@ IF( enable_appfw )
     ${CAPI_APPFW_WIDGET_BASE_CFLAGS}
     ${ECORE_IMF_CFLAGS}
     ${FRIBIDI_CFLAGS}
+    ${COMPONENT_BASED_CORE_BASE_CFLAGS}
   )
 
   SET( DALI_LDFLAGS ${DALI_LDFLAGS}
@@ -351,6 +362,7 @@ IF( enable_appfw )
     ${CAPI_APPFW_WIDGET_BASE_LDFLAGS}
     ${ECORE_IMF_LDFLAGS}
     ${FRIBIDI_LDFLAGS}
+    ${COMPONENT_BASED_CORE_BASE_LDFLAGS}
   )
 ELSE()
   SET( DALI_CFLAGS ${DALI_CFLAGS}