Revert "[Tizen] Fix to avoid empty texture rendering issue"

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 291e168..9114e20 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,33 +1,31 @@
 cmake_minimum_required(VERSION 3.11)\r
 \r
-if (WIN32)\r
-\r
 PROJECT (dali-toolkit)\r
 \r
 ADD_DEFINITIONS(\r
--DSTYLE_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/style/"\r
--DDALI_DATA_READ_ONLY_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/dali"\r
--DDALI_IMAGE_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/images/"\r
--DDALI_STYLE_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/dali/toolkit/styles/"\r
--DDALI_SOUND_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/sounds/"\r
--DDALI_STYLE_IMAGE_DIR=DALI_DATA_READ_ONLY_DIR"/toolkit/styles/images/"\r
--DAPPLICATION_RESOURCE_PATH="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res"\r
+-DDALI_ENV="../../dali-env"\r
+-DDALI_DATA_READ_ONLY_DIR=DALI_ENV"/opt/share/dali"\r
+-DDALI_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/images/"\r
+-DDALI_STYLE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/"\r
+-DDALI_SOUND_DIR=DALI_ENV"/opt/share/dali/toolkit/sounds/"\r
+-DDALI_STYLE_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/images/"\r
 -DCURL_STATICLIB=0\r
 /DBUILDING_DALI_TOOLKIT\r
 /vmg\r
 /NODEFAULTLIB:"libcmt.lib"\r
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/PreprocessorDefinitions.h"\r
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/ToolKitPreDefine.h"\r
+/FI"../windows-dependencies/ExInclude/PreprocessorDefinitions.h"\r
+/FI"../windows-dependencies/ExInclude/ToolKitPreDefine.h"\r
 /MP\r
+/Gz\r
 )\r
 \r
 #head file path\r
 INCLUDE_DIRECTORIES(  \r
 ./\r
-${dali_SOURCE_DIR}/dali-core\r
-${dali_SOURCE_DIR}/dali-adaptor\r
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude\r
-${dali_SOURCE_DIR}/dali-env/opt/include\r
+../dali-core\r
+../dali-adaptor\r
+../windows-dependencies/ExInclude\r
+../dali-env/opt/include\r
 )\r
 \r
 #devel-api\r
@@ -64,6 +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/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}/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
@@ -90,6 +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/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/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
@@ -114,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
@@ -277,24 +293,34 @@ SET( SOURCES ${SOURCES}
 )\r
 \r
 link_directories(\r
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExLib\r
-${dali_SOURCE_DIR}/bin\r
+../windows-dependencies/ExLib\r
+../bin\r
 )\r
 \r
 SET( SOURCES ${SOURCES}\r
   dali-toolkit/third-party/nanosvg/nanosvg.cc\r
   dali-toolkit/third-party/nanosvg/nanosvgrast.cc\r
-  dali-toolkit/third-party/facebook-flexbox/layout.c\r
+  dali-toolkit/third-party/yoga/Yoga.cpp\r
+  dali-toolkit/third-party/yoga/YGStyle.cpp\r
+  dali-toolkit/third-party/yoga/YGNodePrint.cpp\r
+  dali-toolkit/third-party/yoga/YGNode.cpp\r
+  dali-toolkit/third-party/yoga/YGLayout.cpp\r
+  dali-toolkit/third-party/yoga/YGFloatOptional.cpp\r
+  dali-toolkit/third-party/yoga/YGEnums.cpp\r
+  dali-toolkit/third-party/yoga/YGConfig.cpp\r
+  dali-toolkit/third-party/yoga/Utils.cpp\r
 )\r
-set(LIBRARY_OUTPUT_PATH ${dali_SOURCE_DIR}/bin)\r
+set(LIBRARY_OUTPUT_PATH ../../../bin)\r
 \r
 ADD_LIBRARY(dali-toolkit SHARED ${SOURCES})\r
 \r
 target_link_libraries(dali-toolkit dali-core.lib)\r
 target_link_libraries(dali-toolkit dali-adaptor.lib)\r
 target_link_libraries(dali-toolkit dlfcn.lib)\r
+target_link_libraries(dali-toolkit WindowsPlatform.lib)\r
 \r
-endif()\r
+add_dependencies(dali-toolkit dali-core)\r
+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