Merge "Hit test algorithm bug fix" into devel/master

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

diff --git a/dali/integration-api/file.list b/dali/integration-api/file.list
index 3742942..ec83f66 100644 (file)
--- a/dali/integration-api/file.list
+++ b/dali/integration-api/file.list
@@ -3,20 +3,18 @@
 platform_abstraction_src_files = \
    $(platform_abstraction_src_dir)/bitmap.cpp \
    $(platform_abstraction_src_dir)/core.cpp \
-   $(platform_abstraction_src_dir)/glyph-set.cpp \
    $(platform_abstraction_src_dir)/image-data.cpp \
    $(platform_abstraction_src_dir)/debug.cpp \
    $(platform_abstraction_src_dir)/profiling.cpp \
    $(platform_abstraction_src_dir)/input-options.cpp \
-   $(platform_abstraction_src_dir)/shader-data.cpp \
    $(platform_abstraction_src_dir)/system-overlay.cpp \
-   $(platform_abstraction_src_dir)/common/lockless-buffer.cpp \
+   $(platform_abstraction_src_dir)/lockless-buffer.cpp \
    $(platform_abstraction_src_dir)/events/event.cpp \
    $(platform_abstraction_src_dir)/events/gesture-event.cpp \
    $(platform_abstraction_src_dir)/events/hover-event-integ.cpp \
    $(platform_abstraction_src_dir)/events/key-event-integ.cpp \
    $(platform_abstraction_src_dir)/events/long-press-gesture-event.cpp \
-   $(platform_abstraction_src_dir)/events/mouse-wheel-event-integ.cpp \
+   $(platform_abstraction_src_dir)/events/wheel-event-integ.cpp \
    $(platform_abstraction_src_dir)/events/multi-point-event-integ.cpp \
    $(platform_abstraction_src_dir)/events/pan-gesture-event.cpp \
    $(platform_abstraction_src_dir)/events/pinch-gesture-event.cpp \
@@ -27,7 +25,6 @@ platform_abstraction_src_files = \
 platform_abstraction_header_files = \
    $(platform_abstraction_src_dir)/core.h \
    $(platform_abstraction_src_dir)/context-notifier.h \
-   $(platform_abstraction_src_dir)/glyph-set.h \
    $(platform_abstraction_src_dir)/debug.h \
    $(platform_abstraction_src_dir)/profiling.h \
    $(platform_abstraction_src_dir)/input-options.h \
@@ -44,21 +41,8 @@ platform_abstraction_header_files = \
    $(platform_abstraction_src_dir)/gesture-manager.h \
    $(platform_abstraction_src_dir)/render-controller.h \
    $(platform_abstraction_src_dir)/platform-abstraction.h \
-   $(platform_abstraction_src_dir)/shader-data.h \
    $(platform_abstraction_src_dir)/system-overlay.h \
-   $(platform_abstraction_src_dir)/common/lockless-buffer.h \
-   $(platform_abstraction_src_dir)/text-array.h
-
-platform_abstraction_dynamics_header_files = \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-body-intf.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-body-settings.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-collision-data.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-debug-vertex.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-factory-intf.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-joint-intf.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-shape-intf.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-world-intf.h \
-   $(platform_abstraction_src_dir)/dynamics/dynamics-world-settings.h
+   $(platform_abstraction_src_dir)/lockless-buffer.h
 
 platform_abstraction_events_header_files = \
    $(platform_abstraction_src_dir)/events/event.h \
@@ -67,7 +51,7 @@ platform_abstraction_events_header_files = \
    $(platform_abstraction_src_dir)/events/hover-event-integ.h \
    $(platform_abstraction_src_dir)/events/key-event-integ.h \
    $(platform_abstraction_src_dir)/events/long-press-gesture-event.h \
-   $(platform_abstraction_src_dir)/events/mouse-wheel-event-integ.h \
+   $(platform_abstraction_src_dir)/events/wheel-event-integ.h \
    $(platform_abstraction_src_dir)/events/multi-point-event-integ.h \
    $(platform_abstraction_src_dir)/events/pan-gesture-event.h \
    $(platform_abstraction_src_dir)/events/pinch-gesture-event.h \