X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=CMakeLists.txt;h=9114e20e6e8a603ccbb64a8eb4647e6dc949a819;hp=291e16834857d30901e015ac5866116ce1461240;hb=c7d84762db43777627ad936f794afb4b08f3e82b;hpb=dae84d59edbafc1332530ef6efce51277dfeb331

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 291e168..9114e20 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,33 +1,31 @@
 cmake_minimum_required(VERSION 3.11)
 
-if (WIN32)
-
 PROJECT (dali-toolkit)
 
 ADD_DEFINITIONS(
--DSTYLE_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/style/"
--DDALI_DATA_READ_ONLY_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/dali"
--DDALI_IMAGE_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/images/"
--DDALI_STYLE_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/dali/toolkit/styles/"
--DDALI_SOUND_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/sounds/"
--DDALI_STYLE_IMAGE_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/styles/images/"
--DAPPLICATION_RESOURCE_PATH="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res"
+-DDALI_ENV="../../dali-env"
+-DDALI_DATA_READ_ONLY_DIR=DALI_ENV"/opt/share/dali"
+-DDALI_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/images/"
+-DDALI_STYLE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/"
+-DDALI_SOUND_DIR=DALI_ENV"/opt/share/dali/toolkit/sounds/"
+-DDALI_STYLE_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/images/"
 -DCURL_STATICLIB=0
 /DBUILDING_DALI_TOOLKIT
 /vmg
 /NODEFAULTLIB:"libcmt.lib"
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/PreprocessorDefinitions.h"
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/ToolKitPreDefine.h"
+/FI"../windows-dependencies/ExInclude/PreprocessorDefinitions.h"
+/FI"../windows-dependencies/ExInclude/ToolKitPreDefine.h"
 /MP
+/Gz
 )
 
 #head file path
 INCLUDE_DIRECTORIES(  
 ./
-${dali_SOURCE_DIR}/dali-core
-${dali_SOURCE_DIR}/dali-adaptor
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude
-${dali_SOURCE_DIR}/dali-env/opt/include
+../dali-core
+../dali-adaptor
+../windows-dependencies/ExInclude
+../dali-env/opt/include
 )
 
 #devel-api
@@ -64,6 +62,14 @@ SET ( SOURCES ${SOURCES}
   ${devel_api_src_dir}/image-loader/atlas-upload-observer.cpp
   ${devel_api_src_dir}/image-loader/image-atlas.cpp
   ${devel_api_src_dir}/image-loader/texture-manager.cpp
+  ${devel_api_src_dir}/layouting/absolute-layout.cpp
+  ${devel_api_src_dir}/layouting/grid.cpp
+  ${devel_api_src_dir}/layouting/linear-layout.cpp
+  ${devel_api_src_dir}/layouting/layout-item-impl.cpp
+  ${devel_api_src_dir}/layouting/layout-item.cpp
+  ${devel_api_src_dir}/layouting/layout-group-impl.cpp
+  ${devel_api_src_dir}/layouting/layout-group.cpp
+  ${devel_api_src_dir}/layouting/layout-controller.cpp
   ${devel_api_src_dir}/scripting/script.cpp
   ${devel_api_src_dir}/styling/style-manager-devel.cpp
   ${devel_api_src_dir}/transition-effects/cube-transition-cross-effect.cpp
@@ -90,6 +96,15 @@ SET( SOURCES ${SOURCES}
    ${internal_src_dir}/builder/style.cpp
    ${internal_src_dir}/builder/tree-node-manipulator.cpp
    ${internal_src_dir}/builder/replacement.cpp
+   ${internal_src_dir}/layouting/absolute-layout-impl.cpp
+   ${internal_src_dir}/layouting/grid-impl.cpp
+   ${internal_src_dir}/layouting/grid-locations.cpp
+   ${internal_src_dir}/layouting/linear-layout-impl.cpp
+   ${internal_src_dir}/layouting/layout-item-data-impl.cpp
+   ${internal_src_dir}/layouting/layout-group-data-impl.cpp
+   ${internal_src_dir}/layouting/layout-controller-impl.cpp
+   ${internal_src_dir}/layouting/layout-controller-debug.cpp
+   ${internal_src_dir}/layouting/layout-transition-data-impl.cpp
    ${internal_src_dir}/visuals/animated-image/animated-image-visual.cpp
    ${internal_src_dir}/visuals/animated-image/image-cache.cpp
    ${internal_src_dir}/visuals/animated-image/fixed-image-cache.cpp
@@ -114,6 +129,7 @@ SET( SOURCES ${SOURCES}
    ${internal_src_dir}/visuals/transition-data-impl.cpp
    ${internal_src_dir}/visuals/texture-manager-impl.cpp
    ${internal_src_dir}/visuals/texture-upload-observer.cpp
+   ${internal_src_dir}/visuals/image-visual-shader-factory.cpp
    ${internal_src_dir}/visuals/visual-base-data-impl.cpp
    ${internal_src_dir}/visuals/visual-base-impl.cpp
    ${internal_src_dir}/visuals/visual-factory-cache.cpp
@@ -277,24 +293,34 @@ SET( SOURCES ${SOURCES}
 )
 
 link_directories(
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExLib
-${dali_SOURCE_DIR}/bin
+../windows-dependencies/ExLib
+../bin
 )
 
 SET( SOURCES ${SOURCES}
   dali-toolkit/third-party/nanosvg/nanosvg.cc
   dali-toolkit/third-party/nanosvg/nanosvgrast.cc
-  dali-toolkit/third-party/facebook-flexbox/layout.c
+  dali-toolkit/third-party/yoga/Yoga.cpp
+  dali-toolkit/third-party/yoga/YGStyle.cpp
+  dali-toolkit/third-party/yoga/YGNodePrint.cpp
+  dali-toolkit/third-party/yoga/YGNode.cpp
+  dali-toolkit/third-party/yoga/YGLayout.cpp
+  dali-toolkit/third-party/yoga/YGFloatOptional.cpp
+  dali-toolkit/third-party/yoga/YGEnums.cpp
+  dali-toolkit/third-party/yoga/YGConfig.cpp
+  dali-toolkit/third-party/yoga/Utils.cpp
 )
-set(LIBRARY_OUTPUT_PATH ${dali_SOURCE_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH ../../../bin)
 
 ADD_LIBRARY(dali-toolkit SHARED ${SOURCES})
 
 target_link_libraries(dali-toolkit dali-core.lib)
 target_link_libraries(dali-toolkit dali-adaptor.lib)
 target_link_libraries(dali-toolkit dlfcn.lib)
+target_link_libraries(dali-toolkit WindowsPlatform.lib)
 
-endif()
+add_dependencies(dali-toolkit dali-core)
+add_dependencies(dali-toolkit dali-adaptor)
 
 #add link library  
-#TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES})
\ No newline at end of file
+#TARGET_LINK_LIBRARIES(${FS_BUILD_BINARY_PREFIX}sqrt ${LIBRARIES})