summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/Makefile_Ector.am31
-rw-r--r--src/lib/ector/CMakeLists.txt139
-rw-r--r--src/lib/efl/config.h.cmake2
-rw-r--r--src/tests/ector/cxx_compile_test/cxx_compile_test.cxx (renamed from src/tests/ector/cxx_compile_test.cxx)0
-rw-r--r--src/tests/ector/suite/CMakeLists.txt5
-rw-r--r--src/tests/ector/suite/ector_suite.c (renamed from src/tests/ector/ector_suite.c)0
-rw-r--r--src/tests/ector/suite/ector_suite.h (renamed from src/tests/ector/ector_suite.h)0
-rw-r--r--src/tests/ector/suite/ector_test_init.c (renamed from src/tests/ector/ector_test_init.c)0
9 files changed, 163 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92bf810..b9cebbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ EFL_LIB(eet)
40EFL_LIB(ecore) 40EFL_LIB(ecore)
41EFL_LIB(eldbus) 41EFL_LIB(eldbus)
42EFL_LIB(embryo) 42EFL_LIB(embryo)
43EFL_LIB(ector)
43 44
44EFL_OPTIONS_SUMMARY() 45EFL_OPTIONS_SUMMARY()
45 46
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 3eadc46..19053be 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -177,29 +177,30 @@ lib_ector_libector_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
177 177
178if EFL_ENABLE_TESTS 178if EFL_ENABLE_TESTS
179 179
180check_PROGRAMS += tests/ector/ector_suite tests/ector/cxx_compile_test 180check_PROGRAMS += tests/ector/suite/ector_suite tests/ector/cxx_compile_test/cxx_compile_test
181TESTS += tests/ector/ector_suite 181TESTS += tests/ector/suite/ector_suite
182 182
183tests_ector_ector_suite_SOURCES = \ 183tests_ector_suite_ector_suite_SOURCES = \
184tests/ector/ector_suite.c \ 184tests/ector/suite/ector_suite.c \
185tests/ector/ector_suite.h \ 185tests/ector/suite/ector_suite.h \
186tests/ector/ector_test_init.c 186tests/ector/suite/ector_test_init.c
187 187
188tests_ector_cxx_compile_test_SOURCES = tests/ector/cxx_compile_test.cxx 188tests_ector_cxx_compile_test_cxx_compile_test_SOURCES = tests/ector/cxx_compile_test/cxx_compile_test.cxx
189tests_ector_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECTOR_CFLAGS@ 189tests_ector_cxx_compile_test_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECTOR_CFLAGS@
190tests_ector_cxx_compile_test_LDADD = @USE_ECTOR_LIBS@ 190tests_ector_cxx_compile_test_cxx_compile_test_LDADD = @USE_ECTOR_LIBS@
191tests_ector_cxx_compile_test_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@ 191tests_ector_cxx_compile_test_cxx_compile_test_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@
192 192
193 193
194tests_ector_ector_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 194tests_ector_suite_ector_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
195-I$(top_srcdir)/src/tests/ector \
195-DTESTS_WD=\"`pwd`\" \ 196-DTESTS_WD=\"`pwd`\" \
196-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ector\" \ 197-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ector/suite\" \
197-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/ector\" \ 198-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/ector/suite\" \
198-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \ 199-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
199@CHECK_CFLAGS@ \ 200@CHECK_CFLAGS@ \
200@ECTOR_CFLAGS@ 201@ECTOR_CFLAGS@
201tests_ector_ector_suite_LDADD = @CHECK_LIBS@ @USE_ECTOR_LIBS@ 202tests_ector_suite_ector_suite_LDADD = @CHECK_LIBS@ @USE_ECTOR_LIBS@
202tests_ector_ector_suite_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@ 203tests_ector_suite_ector_suite_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@
203 204
204endif 205endif
205 206
diff --git a/src/lib/ector/CMakeLists.txt b/src/lib/ector/CMakeLists.txt
new file mode 100644
index 0000000..1339091
--- /dev/null
+++ b/src/lib/ector/CMakeLists.txt
@@ -0,0 +1,139 @@
1set(DESCRIPTION "Enlightened retained mode drawing library")
2
3set(LIBRARIES
4 eet
5 efl
6 emile
7 m
8)
9
10set(PUBLIC_LIBRARIES
11 eina
12 eo
13)
14
15set(PUBLIC_EO_FILES
16 ector_buffer.eo
17 ector_renderer.eo
18 ector_renderer_buffer.eo
19 ector_renderer_gradient.eo
20 ector_renderer_gradient_linear.eo
21 ector_renderer_gradient_radial.eo
22 ector_renderer_shape.eo
23 ector_surface.eo
24 ector_types.eot
25
26 cairo/ector_cairo_software_surface.eo
27 cairo/ector_cairo_surface.eo
28 cairo/ector_renderer_cairo.eo
29 cairo/ector_renderer_cairo_gradient_linear.eo
30 cairo/ector_renderer_cairo_gradient_radial.eo
31 cairo/ector_renderer_cairo_shape.eo
32
33 gl/ector_gl_buffer.eo
34 gl/ector_gl_buffer_base.eo
35 gl/ector_gl_surface.eo
36 gl/ector_renderer_gl.eo
37 gl/ector_renderer_gl_gradient_linear.eo
38 gl/ector_renderer_gl_gradient_radial.eo
39 gl/ector_renderer_gl_shape.eo
40
41 software/ector_renderer_software.eo
42 software/ector_renderer_software_buffer.eo
43 software/ector_renderer_software_gradient_linear.eo
44 software/ector_renderer_software_gradient_radial.eo
45 software/ector_renderer_software_shape.eo
46 software/ector_software_buffer.eo
47 software/ector_software_buffer_base.eo
48 software/ector_software_surface.eo
49)
50
51set(PUBLIC_HEADERS
52 Ector.h
53 ector_buffer.h
54 ector_renderer.h
55 ector_surface.h
56 ector_util.h
57
58 cairo/Ector_Cairo.h
59
60 gl/Ector_GL.h
61
62 software/Ector_Software.h
63)
64
65set(SOURCES
66 ector_buffer.c
67 ector_gl_internal.h
68 ector_main.c
69 ector_renderer.c
70 ector_renderer_buffer.c
71 ector_renderer_gradient.c
72 ector_renderer_gradient_linear.c
73 ector_renderer_gradient_radial.c
74 ector_renderer_shape.c
75
76 cairo/ector_cairo_software_surface.c
77 cairo/ector_cairo_surface.c
78 cairo/ector_renderer_cairo.c
79 cairo/ector_renderer_cairo_gradient_linear.c
80 cairo/ector_renderer_cairo_gradient_radial.c
81 cairo/ector_renderer_cairo_shape.c
82
83 gl/ector_gl_buffer.c
84 gl/ector_gl_buffer_base.c
85 gl/ector_gl_private.h
86 gl/ector_gl_shader.c
87 gl/ector_gl_surface.c
88 gl/ector_renderer_gl.c
89 gl/ector_renderer_gl_gradient_linear.c
90 gl/ector_renderer_gl_gradient_radial.c
91 gl/ector_renderer_gl_shape.c
92 gl/shader/ector_gl_shaders.x
93
94 software/ector_renderer_software_buffer.c
95 software/ector_renderer_software_gradient_linear.c
96 software/ector_renderer_software_gradient_radial.c
97 software/ector_renderer_software_shape.c
98 software/ector_software_buffer.c
99 software/ector_software_gradient.c
100 software/ector_software_rasterizer.c
101 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)
128
129add_custom_command(
130 OUTPUT ${EFL_LIB_SOURCE_DIR}/gl/shader/ector_gl_shaders.x
131 COMMAND /bin/sh ${EFL_LIB_SOURCE_DIR}/gl/shader/gen_shaders.sh
132 DEPENDS
133 ${EFL_LIB_SOURCE_DIR}/gl/shader/gen_shaders.sh
134 ${EFL_LIB_SOURCE_DIR}/gl/shader/fragment.glsl
135 ${EFL_LIB_SOURCE_DIR}/gl/shader/vertex.glsl
136 ${EFL_LIB_SOURCE_DIR}/gl/shader/include.glsl
137 WORKING_DIRECTORY "${EFL_LIB_SOURCE_DIR}"
138 COMMENT "SHADERS ${EFL_LIB_SOURCE_DIR}/gl/shader/ector_gl_shaders.x"
139)
diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake
index 35ab3c3..9bf5126 100644
--- a/src/lib/efl/config.h.cmake
+++ b/src/lib/efl/config.h.cmake
@@ -1,7 +1,9 @@
1#ifndef CONFIG_H 1#ifndef CONFIG_H
2#define CONFIG_H 2#define CONFIG_H
3 3
4#ifndef _GNU_SOURCE
4#define _GNU_SOURCE 5#define _GNU_SOURCE
6#endif
5 7
6#include "config_gen.h" 8#include "config_gen.h"
7 9
diff --git a/src/tests/ector/cxx_compile_test.cxx b/src/tests/ector/cxx_compile_test/cxx_compile_test.cxx
index 091757a..091757a 100644
--- a/src/tests/ector/cxx_compile_test.cxx
+++ b/src/tests/ector/cxx_compile_test/cxx_compile_test.cxx
diff --git a/src/tests/ector/suite/CMakeLists.txt b/src/tests/ector/suite/CMakeLists.txt
new file mode 100644
index 0000000..40f7717
--- /dev/null
+++ b/src/tests/ector/suite/CMakeLists.txt
@@ -0,0 +1,5 @@
1set(SOURCES
2 ector_suite.c
3 ector_suite.h
4 ector_test_init.c
5)
diff --git a/src/tests/ector/ector_suite.c b/src/tests/ector/suite/ector_suite.c
index fa491df..fa491df 100644
--- a/src/tests/ector/ector_suite.c
+++ b/src/tests/ector/suite/ector_suite.c
diff --git a/src/tests/ector/ector_suite.h b/src/tests/ector/suite/ector_suite.h
index 176a838..176a838 100644
--- a/src/tests/ector/ector_suite.h
+++ b/src/tests/ector/suite/ector_suite.h
diff --git a/src/tests/ector/ector_test_init.c b/src/tests/ector/suite/ector_test_init.c
index 5194cbd..5194cbd 100644
--- a/src/tests/ector/ector_test_init.c
+++ b/src/tests/ector/suite/ector_test_init.c