diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2013-01-26 22:48:24 +0100 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2013-09-12 16:47:28 +0200 |
| commit | 8c001e411e280e5b232c47cc6528bd700a95bc6e (patch) | |
| tree | 42d399d9d238fd5b9c4117c5bdf813f4732a63b6 | |
| parent | da324be308e7d3749b2a6da31ca0165ce31978d8 (diff) | |
cgl: Update autogenerated fileswip/cgl
The Makefile.win32.features files are automatically generated by
./autogen.sh.
| -rw-r--r-- | boilerplate/Makefile.win32.features | 12 | ||||
| -rw-r--r-- | build/Makefile.win32.features | 1 | ||||
| -rw-r--r-- | build/Makefile.win32.features-h | 3 | ||||
| -rw-r--r-- | src/Makefile.win32.features | 16 |
4 files changed, 32 insertions, 0 deletions
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index e60a95ba6..86d66e63a 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -223,6 +223,18 @@ enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_png_cxx_sources) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources) endif +unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_cgl_headers) +all_cairo_boilerplate_headers += $(cairo_boilerplate_cgl_headers) +all_cairo_boilerplate_private += $(cairo_boilerplate_cgl_private) +all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_cgl_cxx_sources) +all_cairo_boilerplate_sources += $(cairo_boilerplate_cgl_sources) +ifeq ($(CAIRO_HAS_CGL_FUNCTIONS),1) +enabled_cairo_boilerplate_headers += $(cairo_boilerplate_cgl_headers) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_cgl_private) +enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_cgl_cxx_sources) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_cgl_sources) +endif + unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_gl_private) diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index 8cb155dc0..7fff5d5ae 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -17,6 +17,7 @@ CAIRO_HAS_BEOS_SURFACE=0 CAIRO_HAS_DRM_SURFACE=0 CAIRO_HAS_GALLIUM_SURFACE=0 CAIRO_HAS_PNG_FUNCTIONS=1 +CAIRO_HAS_CGL_FUNCTIONS=0 CAIRO_HAS_GL_SURFACE=0 CAIRO_HAS_GLESV2_SURFACE=0 CAIRO_HAS_COGL_SURFACE=0 diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index 13904cfa9..b9787f788 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -56,6 +56,9 @@ endif ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) @echo "#define CAIRO_HAS_PNG_FUNCTIONS 1" >> $(top_srcdir)/src/cairo-features.h endif +ifeq ($(CAIRO_HAS_CGL_FUNCTIONS),1) + @echo "#define CAIRO_HAS_CGL_FUNCTIONS 1" >> $(top_srcdir)/src/cairo-features.h +endif ifeq ($(CAIRO_HAS_GL_SURFACE),1) @echo "#define CAIRO_HAS_GL_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h endif diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features index 2274f4ad6..585287a23 100644 --- a/src/Makefile.win32.features +++ b/src/Makefile.win32.features @@ -293,6 +293,22 @@ ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) enabled_cairo_pkgconf += cairo-png.pc endif +unsupported_cairo_headers += $(cairo_cgl_headers) +all_cairo_headers += $(cairo_cgl_headers) +all_cairo_private += $(cairo_cgl_private) +all_cairo_cxx_sources += $(cairo_cgl_cxx_sources) +all_cairo_sources += $(cairo_cgl_sources) +ifeq ($(CAIRO_HAS_CGL_FUNCTIONS),1) +enabled_cairo_headers += $(cairo_cgl_headers) +enabled_cairo_private += $(cairo_cgl_private) +enabled_cairo_cxx_sources += $(cairo_cgl_cxx_sources) +enabled_cairo_sources += $(cairo_cgl_sources) +endif +all_cairo_pkgconf += cairo-cgl.pc +ifeq ($(CAIRO_HAS_CGL_FUNCTIONS),1) +enabled_cairo_pkgconf += cairo-cgl.pc +endif + unsupported_cairo_headers += $(cairo_gl_headers) all_cairo_headers += $(cairo_gl_headers) all_cairo_private += $(cairo_gl_private) |