[Tizen] Restore behavior of Uploaded and LoadingFinished signal

[platform/core/uifw/dali-toolkit.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5942b13..9114e20 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,13 +62,14 @@ SET ( SOURCES ${SOURCES}
   ${devel_api_src_dir}/image-loader/atlas-upload-observer.cpp\r
   ${devel_api_src_dir}/image-loader/image-atlas.cpp\r
   ${devel_api_src_dir}/image-loader/texture-manager.cpp\r
-  ${devel_api_src_dir}/layouting/vbox-layout.cpp\r
+  ${devel_api_src_dir}/layouting/absolute-layout.cpp\r
+  ${devel_api_src_dir}/layouting/grid.cpp\r
+  ${devel_api_src_dir}/layouting/linear-layout.cpp\r
   ${devel_api_src_dir}/layouting/layout-item-impl.cpp\r
   ${devel_api_src_dir}/layouting/layout-item.cpp\r
   ${devel_api_src_dir}/layouting/layout-group-impl.cpp\r
   ${devel_api_src_dir}/layouting/layout-group.cpp\r
   ${devel_api_src_dir}/layouting/layout-controller.cpp\r
-  ${devel_api_src_dir}/layouting/linear-layout.cpp\r
   ${devel_api_src_dir}/scripting/script.cpp\r
   ${devel_api_src_dir}/styling/style-manager-devel.cpp\r
   ${devel_api_src_dir}/transition-effects/cube-transition-cross-effect.cpp\r
@@ -95,12 +96,15 @@ SET( SOURCES ${SOURCES}
    ${internal_src_dir}/builder/style.cpp\r
    ${internal_src_dir}/builder/tree-node-manipulator.cpp\r
    ${internal_src_dir}/builder/replacement.cpp\r
-   ${internal_src_dir}/layouting/vbox-layout-impl.cpp\r
+   ${internal_src_dir}/layouting/absolute-layout-impl.cpp\r
+   ${internal_src_dir}/layouting/grid-impl.cpp\r
+   ${internal_src_dir}/layouting/grid-locations.cpp\r
+   ${internal_src_dir}/layouting/linear-layout-impl.cpp\r
    ${internal_src_dir}/layouting/layout-item-data-impl.cpp\r
    ${internal_src_dir}/layouting/layout-group-data-impl.cpp\r
    ${internal_src_dir}/layouting/layout-controller-impl.cpp\r
    ${internal_src_dir}/layouting/layout-controller-debug.cpp\r
-   ${internal_src_dir}/layouting/linear-layout-impl.cpp\r
+   ${internal_src_dir}/layouting/layout-transition-data-impl.cpp\r
    ${internal_src_dir}/visuals/animated-image/animated-image-visual.cpp\r
    ${internal_src_dir}/visuals/animated-image/image-cache.cpp\r
    ${internal_src_dir}/visuals/animated-image/fixed-image-cache.cpp\r
@@ -125,6 +129,7 @@ SET( SOURCES ${SOURCES}
    ${internal_src_dir}/visuals/transition-data-impl.cpp\r
    ${internal_src_dir}/visuals/texture-manager-impl.cpp\r
    ${internal_src_dir}/visuals/texture-upload-observer.cpp\r
+   ${internal_src_dir}/visuals/image-visual-shader-factory.cpp\r
    ${internal_src_dir}/visuals/visual-base-data-impl.cpp\r
    ${internal_src_dir}/visuals/visual-base-impl.cpp\r
    ${internal_src_dir}/visuals/visual-factory-cache.cpp\r
@@ -318,4 +323,4 @@ add_dependencies(dali-toolkit dali-core)
 add_dependencies(dali-toolkit dali-adaptor)\r
 \r
 #add link library  \r
-#TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES})
\ No newline at end of file
+#TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES})\r