lottie/vector: move pixman code to separate pixman folder.

Change-Id: Ic2d59825403814849f46cad8496a7b409b6d3fda

diff --git a/src/vector/CMakeLists.txt b/src/vector/CMakeLists.txt
index 4c2acfc..573a33b 100644 (file)
--- a/src/vector/CMakeLists.txt
+++ b/src/vector/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 add_subdirectory(freetype)
+add_subdirectory(pixman)
 
 target_sources(lottie-player
     PRIVATE
@@ -11,7 +12,6 @@ target_sources(lottie-player
         "${CMAKE_CURRENT_LIST_DIR}/vdrawhelper.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/vdrawhelper_sse2.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/vdrawhelper_neon.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/vregion.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/vrle.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/vpath.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/vpathmesure.cpp"
@@ -24,14 +24,6 @@ target_sources(lottie-player
         "${CMAKE_CURRENT_LIST_DIR}/vdrawable.cpp"
     )
 
-IF("${ARCH}" STREQUAL "arm")
-SET(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
-target_sources(lottie-player
-    PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/pixman-arm-neon-asm.S"
-    )
-ENDIF("${ARCH}" STREQUAL "arm")
-
 target_include_directories(lottie-player
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}"

diff --git a/src/vector/meson.build b/src/vector/meson.build
index d56d49c..3246e43 100644 (file)
--- a/src/vector/meson.build
+++ b/src/vector/meson.build
@@ -1,7 +1,9 @@
 
 subdir('freetype')
+subdir('pixman')
 
 vector_dep = [freetype_dep]
+vector_dep += pixman_dep
 
 source_file   = files('vdasher.cpp')
 source_file  += files('vbrush.cpp')
@@ -13,7 +15,6 @@ source_file  += files('vdrawhelper_sse2.cpp')
 source_file  += files('vdrawable.cpp')
 
 
-source_file  += files('vregion.cpp')
 source_file  += files('vrle.cpp')
 source_file  += files('vpath.cpp')
 source_file  += files('vpathmesure.cpp')

diff --git a/src/vector/pixman/CMakeLists.txt b/src/vector/pixman/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d38a094
--- /dev/null
+++ b/src/vector/pixman/CMakeLists.txt
@@ -0,0 +1,17 @@
+target_sources(lottie-player
+    PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/vregion.cpp"
+    )
+
+IF("${ARCH}" STREQUAL "arm")
+SET(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
+target_sources(lottie-player
+    PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}/pixman-arm-neon-asm.S"
+    )
+ENDIF("${ARCH}" STREQUAL "arm")
+
+target_include_directories(lottie-player
+    PRIVATE
+        "${CMAKE_CURRENT_LIST_DIR}"
+    )

diff --git a/src/vector/pixman/meson.build b/src/vector/pixman/meson.build
new file mode 100644 (file)
index 0000000..c45d81a
--- /dev/null
+++ b/src/vector/pixman/meson.build
@@ -0,0 +1,7 @@
+
+source_file  = files('vregion.cpp')
+
+pixman_dep = declare_dependency(
+                                 include_directories : include_directories('.'),
+                                  sources : source_file
+                                 )

diff --git a/src/vector/pixman-arm-neon-asm.S b/src/vector/pixman/pixman-arm-neon-asm.S
similarity index 100%
rename from src/vector/pixman-arm-neon-asm.S
rename to src/vector/pixman/pixman-arm-neon-asm.S

diff --git a/src/vector/pixman-arm-neon-asm.h b/src/vector/pixman/pixman-arm-neon-asm.h
similarity index 100%
rename from src/vector/pixman-arm-neon-asm.h
rename to src/vector/pixman/pixman-arm-neon-asm.h

diff --git a/src/vector/vregion.cpp b/src/vector/pixman/vregion.cpp
similarity index 100%
rename from src/vector/vregion.cpp
rename to src/vector/pixman/vregion.cpp

diff --git a/src/vector/vregion.h b/src/vector/pixman/vregion.h
similarity index 100%
rename from src/vector/vregion.h
rename to src/vector/pixman/vregion.h