summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-27 12:38:52 -0200
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-27 12:52:14 -0200
commit525d1e062975f732c54e40074d15500cdcaa4cb4 (patch)
treeb074fd0fef65f756ebbe2d5993313cbafcb882bc
parent28960d78513f95204a75e86af817efb3a343e6b0 (diff)
cmake: add EFL_SUPPORT_LIB() and simplify/speedup its usage.
generate a static library for src/static_libs and use that as LIBRARIES for the actual library, for those such as rg_etc that are used multiple times will even speed up the final build by compiling only once. Although not used, they can be made into shared libraries that would go inside /usr/lib/efl/support/v-1.19/libname.so
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmake/helpers/EflMacros.cmake120
-rw-r--r--src/Makefile_Ector.am1
-rw-r--r--src/Makefile_Evas.am1
-rw-r--r--src/lib/ector/CMakeLists.txt29
-rw-r--r--src/lib/eet/CMakeLists.txt9
-rw-r--r--src/lib/emile/CMakeLists.txt17
-rw-r--r--src/static_libs/draw/CMakeLists.txt17
-rw-r--r--src/static_libs/draw/draw.h3
-rw-r--r--src/static_libs/draw/draw_main.c1
-rw-r--r--src/static_libs/draw/draw_main_sse2.c1
-rw-r--r--src/static_libs/freetype/CMakeLists.txt5
-rw-r--r--src/static_libs/lz4/CMakeLists.txt6
-rw-r--r--src/static_libs/rg_etc/CMakeLists.txt10
-rw-r--r--src/static_libs/triangulator/CMakeLists.txt18
-rw-r--r--src/static_libs/triangulator/triangulator_simple.h6
-rw-r--r--src/static_libs/triangulator/triangulator_stroker.h4
17 files changed, 200 insertions, 54 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9cebbec7f..b3fe86b0c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,12 @@ include_directories(
31 31
32include(${CMAKE_SOURCE_DIR}/cmake/config/common.cmake) 32include(${CMAKE_SOURCE_DIR}/cmake/config/common.cmake)
33 33
34EFL_SUPPORT_LIB(lz4)
35EFL_SUPPORT_LIB(draw)
36EFL_SUPPORT_LIB(freetype)
37EFL_SUPPORT_LIB(rg_etc)
38EFL_SUPPORT_LIB(triangulator)
39
34EFL_LIB(eina) 40EFL_LIB(eina)
35EFL_LIB(eolian) 41EFL_LIB(eolian)
36EFL_LIB(eo) 42EFL_LIB(eo)
diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake
index 33811ba17b..a23c1e7091 100644
--- a/cmake/helpers/EflMacros.cmake
+++ b/cmake/helpers/EflMacros.cmake
@@ -783,6 +783,126 @@ define_property(TARGET PROPERTY EFL_EO_PUBLIC
783 BRIEF_DOCS "EFL's .eo/.eot files associated with this target and installed" 783 BRIEF_DOCS "EFL's .eo/.eot files associated with this target and installed"
784 FULL_DOCS "The list of all .eo or .eot files this target uses and installs") 784 FULL_DOCS "The list of all .eo or .eot files this target uses and installs")
785 785
786# EFL_SUPPORT_LIB(Name)
787#
788# adds a support library as src/static_libs/${Name}, this will
789# generate a static library that can be later referred by other
790# targets using support-${Name}
791#
792# This is simiar to EFL_LIB(), however defaults to STATIC libraries
793# and if set to SHARED will install to
794# lib/efl/support/v-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
795# and it shouldn't set any PUBLIC_HEADERS or PKG_CONFIG_REQUIRES.
796function(EFL_SUPPORT_LIB _target)
797 set(EFL_LIB_CURRENT ${_target})
798 set(EFL_LIB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/static_libs/${_target})
799 set(EFL_LIB_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/static_libs/${_target})
800
801 set(DESCRIPTION)
802 set(PKG_CONFIG_REQUIRES)
803 set(PKG_CONFIG_REQUIRES_PRIVATE)
804 set(INCLUDE_DIRECTORIES)
805 set(SYSTEM_INCLUDE_DIRECTORIES)
806 set(OUTPUT_NAME)
807 set(SOURCES)
808 set(PUBLIC_HEADERS)
809 set(VERSION)
810 set(SOVERSION)
811 set(LIBRARY_TYPE STATIC)
812 set(OBJECT_DEPENDS)
813 set(DEPENDENCIES)
814 set(LIBRARIES)
815 set(PUBLIC_LIBRARIES)
816 set(DEFINITIONS)
817 set(COMPILE_FLAGS)
818 set(LINK_FLAGS)
819
820 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config/${_target}.cmake OPTIONAL)
821 include(${EFL_LIB_SOURCE_DIR}/CMakeLists.txt)
822
823 if(NOT SOURCES)
824 message(WARNING "${EFL_LIB_SOURCE_DIR}/CMakeLists.txt defines no SOURCES")
825 return()
826 endif()
827 if(PUBLIC_HEADERS)
828 message(WARNING "${EFL_LIB_SOURCE_DIR}/CMakeLists.txt should not define PUBLIC_HEADERS, it's not to be installed.")
829 endif()
830 if(PKG_CONFIG_REQUIRES)
831 message(WARNING "${EFL_LIB_SOURCE_DIR}/CMakeLists.txt should not define PKG_CONFIG_REQUIRES. Use PKG_CONFIG_REQUIRES_PRIVATE instead")
832 endif()
833
834 EFL_FILES_TO_ABSOLUTE(_sources ${EFL_LIB_SOURCE_DIR} ${EFL_LIB_BINARY_DIR}
835 ${SOURCES})
836 EFL_FILES_TO_ABSOLUTE(_obj_deps ${EFL_LIB_SOURCE_DIR} ${EFL_LIB_BINARY_DIR}
837 ${OBJECT_DEPENDS})
838
839 EFL_PKG_CONFIG_EVAL(${_target} "${PKG_CONFIG_REQUIRES_PRIVATE}" "${PKG_CONFIG_REQUIRES}")
840
841 set(__link_flags ${${_target}_PKG_CONFIG_REQUIRES_PRIVATE_LDFLAGS} ${${_target}_PKG_CONFIG_REQUIRES_LDFLAGS} ${LINK_FLAGS})
842 set(__compile_flags ${${_target}_PKG_CONFIG_REQUIRES_PRIVATE_CFLAGS} ${${_target}_PKG_CONFIG_REQUIRES_CFLAGS} ${COMPILE_FLAGS})
843
844 set(_link_flags)
845 foreach(_l ${__link_flags})
846 set(_link_flags "${_link_flags} ${_l}")
847 endforeach()
848
849 set(_compile_flags)
850 foreach(_c ${__compile_flags})
851 set(_compile_flags "${_compile_flags} ${_c}")
852 endforeach()
853
854 add_library(support-${_target} ${LIBRARY_TYPE} ${_sources} ${_headers})
855 set_target_properties(support-${_target} PROPERTIES
856 OBJECT_DEPENDS "${_obj_deps}"
857 LINK_FLAGS "${_link_flags}"
858 COMPILE_FLAGS "${_compile_flags}")
859
860 if(DEPENDENCIES)
861 add_dependencies(support-${_target} ${DEPENDENCIES})
862 endif()
863
864 if(LIBRARIES)
865 target_link_libraries(support-${_target} LINK_PRIVATE ${LIBRARIES})
866 endif()
867 if(PUBLIC_LIBRARIES)
868 target_link_libraries(support-${_target} PUBLIC ${PUBLIC_LIBRARIES})
869 endif()
870
871 target_include_directories(support-${_target} PUBLIC
872 ${INCLUDE_DIRECTORIES}
873 ${EFL_LIB_SOURCE_DIR}
874 ${EFL_LIB_BINARY_DIR}
875 )
876 if(SYSTEM_INCLUDE_DIRECTORIES)
877 target_include_directories(support-${_target} SYSTEM PUBLIC ${SYSTEM_INCLUDE_DIRECTORIES})
878 endif()
879
880 if(DEFINITIONS)
881 target_compile_definitions(support-${_target} PRIVATE ${DEFINITIONS})
882 endif()
883
884 if(OUTPUT_NAME)
885 set_target_properties(support-${_target} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME})
886 endif()
887
888 if(VERSION AND SOVERSION)
889 set_target_properties(support-${_target} PROPERTIES
890 VERSION ${VERSION}
891 SOVERSION ${SOVERSION})
892 endif()
893
894 if(LIBRARY_TYPE STREQUAL "SHARED")
895 install(TARGETS support-${_target}
896 RUNTIME DESTINATION lib/efl/support/v-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
897 LIBRARY DESTINATION lib/efl/support/v-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
898 else()
899 set_target_properties(support-${_target} PROPERTIES
900 POSITION_INDEPENDENT_CODE TRUE)
901 endif()
902
903 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/post/${_target}.cmake OPTIONAL)
904endfunction()
905
786# EFL_LIB(Name) 906# EFL_LIB(Name)
787# 907#
788# adds a library ${Name} automatically setting object/target 908# adds a library ${Name} automatically setting object/target
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 19053be5ba..df6e6d2532 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -155,6 +155,7 @@ lib/ector/gl/shader/ector_gl_shaders.x: $(ECTOR_GL_SHADERS_GEN)
155 @sh $(srcdir)/lib/ector/gl/shader/gen_shaders.sh 155 @sh $(srcdir)/lib/ector/gl/shader/gen_shaders.sh
156 156
157lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 157lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
158-I$(top_builddir)/src/lib \
158-I$(top_builddir)/src/lib/ector \ 159-I$(top_builddir)/src/lib/ector \
159-I$(top_builddir)/src/lib/ector/cairo \ 160-I$(top_builddir)/src/lib/ector/cairo \
160-I$(top_builddir)/src/lib/ector/software \ 161-I$(top_builddir)/src/lib/ector/software \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 620f6a0a48..2f58d5f518 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -407,6 +407,7 @@ lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
407-I$(top_srcdir)/src/lib/evas/include \ 407-I$(top_srcdir)/src/lib/evas/include \
408-I$(top_srcdir)/src/static_libs/libunibreak \ 408-I$(top_srcdir)/src/static_libs/libunibreak \
409-I$(top_srcdir)/src/static_libs/draw \ 409-I$(top_srcdir)/src/static_libs/draw \
410-I$(top_builddir)/src/lib \
410-I$(top_builddir)/src/lib/evas/canvas \ 411-I$(top_builddir)/src/lib/evas/canvas \
411-I$(top_builddir)/src/lib/evas/include \ 412-I$(top_builddir)/src/lib/evas/include \
412-I$(top_builddir)/src/modules/evas/engines/software_generic \ 413-I$(top_builddir)/src/modules/evas/engines/software_generic \
diff --git a/src/lib/ector/CMakeLists.txt b/src/lib/ector/CMakeLists.txt
index 133909192b..71daae7705 100644
--- a/src/lib/ector/CMakeLists.txt
+++ b/src/lib/ector/CMakeLists.txt
@@ -5,6 +5,10 @@ set(LIBRARIES
5 efl 5 efl
6 emile 6 emile
7 m 7 m
8 support-draw
9 support-freetype
10 support-rg_etc
11 support-triangulator
8) 12)
9 13
10set(PUBLIC_LIBRARIES 14set(PUBLIC_LIBRARIES
@@ -99,31 +103,6 @@ set(SOURCES
99 software/ector_software_gradient.c 103 software/ector_software_gradient.c
100 software/ector_software_rasterizer.c 104 software/ector_software_rasterizer.c
101 software/ector_software_surface.c 105 software/ector_software_surface.c
102
103 ${CMAKE_SOURCE_DIR}/src/static_libs/draw/draw_main.c
104 ${CMAKE_SOURCE_DIR}/src/static_libs/draw/draw_main_neon.c
105 ${CMAKE_SOURCE_DIR}/src/static_libs/draw/draw_main_sse2.c
106
107 ${CMAKE_SOURCE_DIR}/src/static_libs/freetype/sw_ft_math.c
108 ${CMAKE_SOURCE_DIR}/src/static_libs/freetype/sw_ft_raster.c
109 ${CMAKE_SOURCE_DIR}/src/static_libs/freetype/sw_ft_stroker.c
110
111 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/etc2_encoder.c
112 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.c
113 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.h
114 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc2.c
115
116 ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_simple.c
117 ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_simple.h
118 ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_stroker.c
119 ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_stroker.h
120)
121
122set(INCLUDE_DIRECTORIES
123 ${CMAKE_SOURCE_DIR}/src/static_libs/draw
124 ${CMAKE_SOURCE_DIR}/src/static_libs/freetype
125 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc
126 ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator
127) 106)
128 107
129add_custom_command( 108add_custom_command(
diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
index b0aaffd190..813f29340e 100644
--- a/src/lib/eet/CMakeLists.txt
+++ b/src/lib/eet/CMakeLists.txt
@@ -12,6 +12,7 @@ set(PUBLIC_LIBRARIES
12 12
13set(LIBRARIES 13set(LIBRARIES
14 m 14 m
15 support-rg_etc
15) 16)
16 17
17set(PUBLIC_HEADERS 18set(PUBLIC_HEADERS
@@ -29,14 +30,6 @@ set(SOURCES
29 eet_node.c 30 eet_node.c
30 Eet_private.h 31 Eet_private.h
31 eet_utils.c 32 eet_utils.c
32 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.c
33 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc2.c
34 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/etc2_encoder.c
35 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.h
36)
37
38set(INCLUDE_DIRECTORIES
39 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc
40) 33)
41 34
42if(WITH_CRYPTO STREQUAL "gnutls") 35if(WITH_CRYPTO STREQUAL "gnutls")
diff --git a/src/lib/emile/CMakeLists.txt b/src/lib/emile/CMakeLists.txt
index 559f7355b6..d6c315521a 100644
--- a/src/lib/emile/CMakeLists.txt
+++ b/src/lib/emile/CMakeLists.txt
@@ -8,6 +8,7 @@ set(PKG_CONFIG_REQUIRES_PRIVATE
8set(LIBRARIES 8set(LIBRARIES
9 eina 9 eina
10 m 10 m
11 support-rg_etc
11) 12)
12 13
13set(PUBLIC_HEADERS 14set(PUBLIC_HEADERS
@@ -24,14 +25,6 @@ set(SOURCES
24 emile_image.c 25 emile_image.c
25 emile_main.c 26 emile_main.c
26 emile_private.h 27 emile_private.h
27 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/etc2_encoder.c
28 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.c
29 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.h
30 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc2.c
31)
32
33set(INCLUDE_DIRECTORIES
34 ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc
35) 28)
36 29
37if(WITH_CRYPTO STREQUAL "gnutls") 30if(WITH_CRYPTO STREQUAL "gnutls")
@@ -47,11 +40,5 @@ endif()
47if(WITH_LZ4 STREQUAL "system") 40if(WITH_LZ4 STREQUAL "system")
48 list(APPEND PKG_CONFIG_REQUIRES_PRIVATE liblz4) 41 list(APPEND PKG_CONFIG_REQUIRES_PRIVATE liblz4)
49else() 42else()
50 list(APPEND SOURCES 43 list(APPEND LIBRARIES support-lz4)
51 ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4.c
52 ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4.h
53 ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4hc.c
54 ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4hc.h
55 )
56 list(APPEND INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/static_libs/lz4)
57endif() 44endif()
diff --git a/src/static_libs/draw/CMakeLists.txt b/src/static_libs/draw/CMakeLists.txt
new file mode 100644
index 0000000000..b2ad0041dc
--- /dev/null
+++ b/src/static_libs/draw/CMakeLists.txt
@@ -0,0 +1,17 @@
1set(LIBRARIES
2 eina
3)
4
5set(SOURCES
6 draw_main.c
7 draw_main_neon.c
8 draw_main_sse2.c
9)
10
11set(INCLUDE_DIRECTORIES
12 ${CMAKE_BINARY_DIR}/src/lib
13)
14
15set(DEPENDENCIES
16 efl-eo
17)
diff --git a/src/static_libs/draw/draw.h b/src/static_libs/draw/draw.h
index b63b73d2e0..9f4089aba0 100644
--- a/src/static_libs/draw/draw.h
+++ b/src/static_libs/draw/draw.h
@@ -5,7 +5,8 @@
5# include <config.h> 5# include <config.h>
6#endif 6#endif
7 7
8#include <Efl.h> 8#include <Eina.h>
9#include "efl/interfaces/efl_gfx_types.eot.h"
9 10
10/* FIXME: naming convention */ 11/* FIXME: naming convention */
11typedef void (*RGBA_Comp_Func) (uint32_t *dest, const uint32_t *src, int length, uint32_t mul_col, uint32_t const_alpha); 12typedef void (*RGBA_Comp_Func) (uint32_t *dest, const uint32_t *src, int length, uint32_t mul_col, uint32_t const_alpha);
diff --git a/src/static_libs/draw/draw_main.c b/src/static_libs/draw/draw_main.c
index 40b32e99da..8577beacce 100644
--- a/src/static_libs/draw/draw_main.c
+++ b/src/static_libs/draw/draw_main.c
@@ -2,7 +2,6 @@
2#include "config.h" 2#include "config.h"
3#endif 3#endif
4 4
5#include <Ector.h>
6#include "draw_private.h" 5#include "draw_private.h"
7 6
8int _draw_log_dom = -1; 7int _draw_log_dom = -1;
diff --git a/src/static_libs/draw/draw_main_sse2.c b/src/static_libs/draw/draw_main_sse2.c
index e8f934055b..58ed7a3c12 100644
--- a/src/static_libs/draw/draw_main_sse2.c
+++ b/src/static_libs/draw/draw_main_sse2.c
@@ -2,7 +2,6 @@
2#include "config.h" 2#include "config.h"
3#endif 3#endif
4 4
5#include <Ector.h>
6#include "draw_private.h" 5#include "draw_private.h"
7 6
8#ifdef BUILD_SSE3 7#ifdef BUILD_SSE3
diff --git a/src/static_libs/freetype/CMakeLists.txt b/src/static_libs/freetype/CMakeLists.txt
new file mode 100644
index 0000000000..5f669df285
--- /dev/null
+++ b/src/static_libs/freetype/CMakeLists.txt
@@ -0,0 +1,5 @@
1set(SOURCES
2 sw_ft_math.c
3 sw_ft_raster.c
4 sw_ft_stroker.c
5)
diff --git a/src/static_libs/lz4/CMakeLists.txt b/src/static_libs/lz4/CMakeLists.txt
new file mode 100644
index 0000000000..29bdb2032f
--- /dev/null
+++ b/src/static_libs/lz4/CMakeLists.txt
@@ -0,0 +1,6 @@
1set(SOURCES
2 lz4.c
3 lz4.h
4 lz4hc.c
5 lz4hc.h
6)
diff --git a/src/static_libs/rg_etc/CMakeLists.txt b/src/static_libs/rg_etc/CMakeLists.txt
new file mode 100644
index 0000000000..2511bc1837
--- /dev/null
+++ b/src/static_libs/rg_etc/CMakeLists.txt
@@ -0,0 +1,10 @@
1set(LIBRARIES
2 eina
3)
4
5set(SOURCES
6 etc2_encoder.c
7 rg_etc1.c
8 rg_etc1.h
9 rg_etc2.c
10)
diff --git a/src/static_libs/triangulator/CMakeLists.txt b/src/static_libs/triangulator/CMakeLists.txt
new file mode 100644
index 0000000000..78185589df
--- /dev/null
+++ b/src/static_libs/triangulator/CMakeLists.txt
@@ -0,0 +1,18 @@
1set(LIBRARIES
2 eina
3)
4
5set(SOURCES
6 triangulator_simple.c
7 triangulator_simple.h
8 triangulator_stroker.c
9 triangulator_stroker.h
10)
11
12set(INCLUDE_DIRECTORIES
13 ${CMAKE_BINARY_DIR}/src/lib
14)
15
16set(DEPENDENCIES
17 efl-eo
18)
diff --git a/src/static_libs/triangulator/triangulator_simple.h b/src/static_libs/triangulator/triangulator_simple.h
index e87acc6e40..e0c41f6255 100644
--- a/src/static_libs/triangulator/triangulator_simple.h
+++ b/src/static_libs/triangulator/triangulator_simple.h
@@ -1,7 +1,9 @@
1#ifndef TRIANGULATOR_SIMPLE_H_ 1#ifndef TRIANGULATOR_SIMPLE_H_
2#define TRIANGULATOR_SIMPLE_H_ 2#define TRIANGULATOR_SIMPLE_H_
3 3
4#include <Efl.h> 4#include <Eina.h>
5#include "efl/interfaces/efl_gfx_types.eot.h"
6typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
5 7
6typedef struct _Triangulator_Simple Triangulator_Simple; 8typedef struct _Triangulator_Simple Triangulator_Simple;
7struct _Triangulator_Simple 9struct _Triangulator_Simple
@@ -40,4 +42,4 @@ void triangulator_simple_free(Triangulator_Simple *st);
40 */ 42 */
41void triangulator_simple_process(Triangulator_Simple *st, const Efl_Gfx_Path_Command *cmds, const double *pts, Eina_Bool convex); 43void triangulator_simple_process(Triangulator_Simple *st, const Efl_Gfx_Path_Command *cmds, const double *pts, Eina_Bool convex);
42 44
43#endif // #endif // TRIANGULATOR_SIMPLE_H_ \ No newline at end of file 45#endif // #endif // TRIANGULATOR_SIMPLE_H_
diff --git a/src/static_libs/triangulator/triangulator_stroker.h b/src/static_libs/triangulator/triangulator_stroker.h
index 5cc7805638..2dee4290e4 100644
--- a/src/static_libs/triangulator/triangulator_stroker.h
+++ b/src/static_libs/triangulator/triangulator_stroker.h
@@ -1,7 +1,9 @@
1#ifndef TRIANGULATOR_STROKER_H_ 1#ifndef TRIANGULATOR_STROKER_H_
2#define TRIANGULATOR_STROKER_H_ 2#define TRIANGULATOR_STROKER_H_
3 3
4#include <Efl.h> 4#include <Eina.h>
5#include "efl/interfaces/efl_gfx_types.eot.h"
6typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
5 7
6typedef struct _Triangulator_Stroker Triangulator_Stroker; 8typedef struct _Triangulator_Stroker Triangulator_Stroker;
7struct _Triangulator_Stroker 9struct _Triangulator_Stroker