Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / devel-api / file.list

diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list
index 1ecf8f1..3543712 100644 (file)
--- a/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@ -1,5 +1,4 @@
-# Add devel source files here for DALi internal developer files used by Adaptor & Toolkit
-
+# Add devel source files here for DALi internal developer files used by Adaptor & Toolkit 
 devel_api_src_files = \
   $(devel_api_src_dir)/animation/animation-data.cpp \
   $(devel_api_src_dir)/animation/path-constrainer.cpp \
@@ -7,21 +6,15 @@ devel_api_src_files = \
   $(devel_api_src_dir)/events/hit-test-algorithm.cpp \
   $(devel_api_src_dir)/images/atlas.cpp \
   $(devel_api_src_dir)/images/distance-field.cpp \
-  $(devel_api_src_dir)/images/pixel-data.cpp \
-  $(devel_api_src_dir)/object/property-buffer.cpp \
+  $(devel_api_src_dir)/images/texture-set-image.cpp \
+  $(devel_api_src_dir)/images/nine-patch-image.cpp \
   $(devel_api_src_dir)/object/weak-handle.cpp \
-  $(devel_api_src_dir)/rendering/frame-buffer.cpp \
-  $(devel_api_src_dir)/rendering/geometry.cpp \
-  $(devel_api_src_dir)/rendering/texture.cpp \
-  $(devel_api_src_dir)/rendering/texture-set.cpp \
-  $(devel_api_src_dir)/rendering/renderer.cpp \
-  $(devel_api_src_dir)/rendering/sampler.cpp \
-  $(devel_api_src_dir)/rendering/shader.cpp \
   $(devel_api_src_dir)/scripting/scripting.cpp \
   $(devel_api_src_dir)/signals/signal-delegate.cpp \
   $(devel_api_src_dir)/threading/conditional-wait.cpp \
   $(devel_api_src_dir)/threading/mutex.cpp \
-  $(devel_api_src_dir)/threading/thread.cpp
+  $(devel_api_src_dir)/threading/thread.cpp \
+  $(devel_api_src_dir)/shader-effects/shader-effect.cpp
 
 # Add devel header files here DALi internal developer files used by Adaptor & Toolkit
 
@@ -42,26 +35,18 @@ devel_api_core_events_header_files = \
 devel_api_core_images_header_files = \
   $(devel_api_src_dir)/images/atlas.h \
   $(devel_api_src_dir)/images/distance-field.h \
-  $(devel_api_src_dir)/images/pixel-data.h \
-  $(devel_api_src_dir)/images/native-image-interface-extension.h
+  $(devel_api_src_dir)/images/native-image-interface-extension.h \
+  $(devel_api_src_dir)/images/texture-set-image.h \
+  $(devel_api_src_dir)/images/nine-patch-image.h
 
 devel_api_core_object_header_files = \
-  $(devel_api_src_dir)/object/property-buffer.h \
   $(devel_api_src_dir)/object/weak-handle.h
 
-devel_api_core_rendering_header_files = \
-  $(devel_api_src_dir)/rendering/frame-buffer.h \
-  $(devel_api_src_dir)/rendering/geometry.h \
-  $(devel_api_src_dir)/rendering/texture.h \
-  $(devel_api_src_dir)/rendering/texture-set.h \
-  $(devel_api_src_dir)/rendering/renderer.h \
-  $(devel_api_src_dir)/rendering/sampler.h \
-  $(devel_api_src_dir)/rendering/shader.h
-
 devel_api_core_signals_header_files = \
   $(devel_api_src_dir)/signals/signal-delegate.h
 
 devel_api_core_scripting_header_files = \
+  $(devel_api_src_dir)/scripting/enum-helper.h \
   $(devel_api_src_dir)/scripting/scripting.h
 
 devel_api_core_threading_header_files = \
@@ -69,3 +54,5 @@ devel_api_core_threading_header_files = \
   $(devel_api_src_dir)/threading/mutex.h \
   $(devel_api_src_dir)/threading/thread.h
 
+devel_api_core_shader_effects_header_files = \
+  $(devel_api_src_dir)/shader-effects/shader-effect.h