Updating to match dali library changes

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 68e3ca258a84cde720518fbabe653165fd022529..a3e2487be82baed7e6914b7f48f5f18281038390 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -217,9 +217,9 @@ ENDFOREACH(flag)
 MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/images")
 
 IF( ENABLE_PKG_CONFIGURE )
-  SET(PKG_LIST dali2-core
-               dali2-adaptor
-               dali2-toolkit)
+  SET(PKG_LIST dali-core
+               dali-adaptor
+               dali-toolkit)
 
   INCLUDE(FindPkgConfig)
   pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST})
@@ -228,7 +228,7 @@ IF( ENABLE_PKG_CONFIGURE )
         SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
   ENDFOREACH(flag)
 
-  pkg_check_modules(DALI_SCENE3D dali2-scene3d)
+  pkg_check_modules(DALI_SCENE3D dali-scene3d)
   IF( DALI_SCENE3D_FOUND )
     FOREACH(flag ${DALI_SCENE3D_CFLAGS})
       SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
@@ -243,7 +243,7 @@ IF( ENABLE_PKG_CONFIGURE )
     SET( ENABLE_SCENE3D "ON" )
   ENDIF()
 
-  pkg_check_modules(DALI_PHYSICS_2D dali2-physics-2d chipmunk2d)
+  pkg_check_modules(DALI_PHYSICS_2D dali-physics-2d chipmunk2d)
   IF( DALI_PHYSICS_2D_FOUND )
     FOREACH(flag ${DALI_PHYSICS_2D_CFLAGS})
       SET(OPTIONAL_PHYSICS_2D_CFLAGS "${OPTIONAL_PHYSICS_2D_CFLAGS} ${flag}")
@@ -259,7 +259,7 @@ IF( ENABLE_PKG_CONFIGURE )
     SET( ENABLE_PHYSICS_2D "ON" )
   ENDIF()
 
-  pkg_check_modules(DALI_PHYSICS_3D dali2-physics-3d bullet3)
+  pkg_check_modules(DALI_PHYSICS_3D dali-physics-3d bullet3)
   IF( DALI_PHYSICS_3D_FOUND )
     FOREACH(flag ${DALI_PHYSICS_3D_CFLAGS})
       SET(OPTIONAL_PHYSICS_3D_CFLAGS "${OPTIONAL_PHYSICS_3D_CFLAGS} ${flag}")
@@ -319,16 +319,16 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
     FIND_PACKAGE( unofficial-fontconfig REQUIRED )
   ENDIF()
 
-  FIND_PACKAGE( dali2-core REQUIRED )
-  FIND_PACKAGE( dali2-adaptor REQUIRED )
-  FIND_PACKAGE( dali2-toolkit REQUIRED )
+  FIND_PACKAGE( dali-core REQUIRED )
+  FIND_PACKAGE( dali-adaptor REQUIRED )
+  FIND_PACKAGE( dali-toolkit REQUIRED )
 
-  FIND_PACKAGE( dali2-scene3d )
+  FIND_PACKAGE( dali-scene3d )
 
   FIND_PACKAGE( chipmunk )
   FIND_PACKAGE( bullet3 )
-  FIND_PACKAGE( dali2-physics-2d )
-  FIND_PACKAGE( dali2-physics-3d )
+  FIND_PACKAGE( dali-physics-2d )
+  FIND_PACKAGE( dali-physics-3d )
 
   # Set up the include dir
   SET( INCLUDE_DIR $ENV{includedir} )
@@ -361,9 +361,9 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
     unofficial::angle::libGLESv2
     WebP::webp
     WebP::webpdemux
-    dali2-core::dali2-core
-    dali2-adaptor::dali2-adaptor
-    dali2-toolkit::dali2-toolkit
+    dali-core::dali-core
+    dali-adaptor::dali-adaptor
+    dali-toolkit::dali-toolkit
   )
 
   IF ( WIN32 )
@@ -377,10 +377,10 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
     )
   ENDIF()
 
-  IF (dali2-scene3d_FOUND)
+  IF (dali-scene3d_FOUND)
     SET(REQUIRED_LIBS
       ${REQUIRED_LIBS}
-      dali2-scene3d::dali2-scene3d
+      dali-scene3d::dali-scene3d
     )
     SET( ENABLE_SCENE3D "ON" )
   ENDIF()
@@ -395,12 +395,12 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
     SET(ENABLE_PHYSICS_3D "ON" )
   ENDIF()
 
-  IF (dali2-physics-2d_FOUND)
-    SET(DALI_PHYSICS_2D_LDFLAGS ${DALI_PHYSICS_2D_LDFLAGS} dali2-physics-2d::dali2-physics-2d)
+  IF (dali-physics-2d_FOUND)
+    SET(DALI_PHYSICS_2D_LDFLAGS ${DALI_PHYSICS_2D_LDFLAGS} dali-physics-2d::dali-physics-2d)
   ENDIF()
 
-  IF (dali2-physics-3d_FOUND)
-    SET(DALI_PHYSICS_3D_LDFLAGS ${DALI_PHYSICS_3D_LDFLAGS} dali2-physics-3d::dali2-physics-3d)
+  IF (dali-physics-3d_FOUND)
+    SET(DALI_PHYSICS_3D_LDFLAGS ${DALI_PHYSICS_3D_LDFLAGS} dali-physics-3d::dali-physics-3d)
   ENDIF()
 
 ELSEIF( UNIX )

diff --git a/examples/pre-render-callback/pre-render-callback-example.cpp b/examples/pre-render-callback/pre-render-callback-example.cpp
index c4ad1c9395190a0b82e00390d22517761f36f4ca..664868ee8e5627c2aaab71a08fc5139652078ad0 100644 (file)
--- a/examples/pre-render-callback/pre-render-callback-example.cpp
+++ b/examples/pre-render-callback/pre-render-callback-example.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/devel-api/adaptor-framework/application-devel.h>
 #include <dali-toolkit/devel-api/layouting/linear-layout.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>