summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-23 14:59:40 +0000
committerTom Hacohen <tom@stosb.com>2016-03-23 15:00:16 +0000
commit2583246997df9875f94ff9334b8f736aaa1d57c0 (patch)
tree67fb239569cc84c448001804447362e6672567c2 /src
parent13ae9992119af5f8f3c4886bc56449c6e69f9dc5 (diff)
Ector: add ector_types.eot for ector type definitions.
This fixes the GLShort duplicate declaration.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ector.am9
-rw-r--r--src/lib/ector/ector_types.eot2
-rw-r--r--src/lib/ector/gl/ector_gl_surface.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_base.eo2
4 files changed, 11 insertions, 4 deletions
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index f1a8178a08..6a3a14ae8c 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -44,14 +44,19 @@ ector_eolian_files_gl = \
44 lib/ector/gl/ector_renderer_gl_gradient_linear.eo 44 lib/ector/gl/ector_renderer_gl_gradient_linear.eo
45ector_eolian_gl_h = $(ector_eolian_files_gl:%.eo=%.eo.h) 45ector_eolian_gl_h = $(ector_eolian_files_gl:%.eo=%.eo.h)
46 46
47ector_eolian_type_files = \
48 lib/ector/ector_types.eot
49
47ector_eolian_files = \ 50ector_eolian_files = \
48 $(ector_eolian_files_generic) \ 51 $(ector_eolian_files_generic) \
49 $(ector_eolian_files_cairo) \ 52 $(ector_eolian_files_cairo) \
50 $(ector_eolian_files_software) \ 53 $(ector_eolian_files_software) \
51 $(ector_eolian_files_gl) 54 $(ector_eolian_files_gl) \
55 $(ector_eolian_type_files)
52 56
53ector_eolian_c = $(ector_eolian_files:%.eo=%.eo.c) 57ector_eolian_c = $(ector_eolian_files:%.eo=%.eo.c)
54ector_eolian_h = $(ector_eolian_files:%.eo=%.eo.h) 58ector_eolian_h = $(ector_eolian_files:%.eo=%.eo.h) \
59 $(ector_eolian_type_files:%.eot=%.eot.h)
55 60
56BUILT_SOURCES += \ 61BUILT_SOURCES += \
57 $(ector_eolian_c) \ 62 $(ector_eolian_c) \
diff --git a/src/lib/ector/ector_types.eot b/src/lib/ector/ector_types.eot
new file mode 100644
index 0000000000..c142a6a513
--- /dev/null
+++ b/src/lib/ector/ector_types.eot
@@ -0,0 +1,2 @@
1type @extern GLshort: short; /* FIXME: We should not expose this in the API but probably redefine it. */
2
diff --git a/src/lib/ector/gl/ector_gl_surface.eo b/src/lib/ector/gl/ector_gl_surface.eo
index e500514135..e3585cd64a 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -1,4 +1,4 @@
1type @extern GLshort: short; /* FIXME: We should not expose this in the API but probably redefine it. */ 1import ector_types;
2 2
3class Ector.GL.Surface (Ector.GL.Buffer, Ector.Generic.Surface) 3class Ector.GL.Surface (Ector.GL.Buffer, Ector.Generic.Surface)
4{ 4{
diff --git a/src/lib/ector/gl/ector_renderer_gl_base.eo b/src/lib/ector/gl/ector_renderer_gl_base.eo
index 39c4789cb7..fa1e426fa1 100644
--- a/src/lib/ector/gl/ector_renderer_gl_base.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_base.eo
@@ -1,4 +1,4 @@
1type @extern GLshort: short; /* FIXME: We should not expose this in the API but probably redefine it. */ 1import ector_types;
2 2
3abstract Ector.Renderer.GL.Base (Ector.Renderer.Generic.Base) 3abstract Ector.Renderer.GL.Base (Ector.Renderer.Generic.Base)
4{ 4{