diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-21 22:28:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-21 22:28:44 +0100 |
| commit | 1ae5942a3aa9f73aa71438dc40221836b0dff7e2 (patch) | |
| tree | a39297460aaaf3b88c4b26480d12b40ec4eed545 /build | |
| parent | fd9df4978d56bbb85ecd795afce72c0310dbcf3f (diff) | |
| parent | 6a5957475139a7c80a6bb55fb63927e5ec8866f6 (diff) | |
Merge commit 'anholt/gl'
Conflicts:
boilerplate/Makefile.sources
boilerplate/cairo-boilerplate.c
build/configure.ac.features
src/cairo.h
util/cairo-script/Makefile.am
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.win32.features | 2 | ||||
| -rw-r--r-- | build/Makefile.win32.features-h | 6 | ||||
| -rw-r--r-- | build/configure.ac.features | 8 |
3 files changed, 13 insertions, 3 deletions
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index 4d42c8b6e..a7e5442f9 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -12,9 +12,11 @@ CAIRO_HAS_WIN32_FONT=1 CAIRO_HAS_OS2_SURFACE=0 CAIRO_HAS_BEOS_SURFACE=0 CAIRO_HAS_PNG_FUNCTIONS=1 +CAIRO_HAS_GL_SURFACE=0 CAIRO_HAS_GLITZ_SURFACE=0 CAIRO_HAS_DIRECTFB_SURFACE=0 CAIRO_HAS_VG_SURFACE=0 +CAIRO_HAS_EAGLE_FUNCTIONS=0 CAIRO_HAS_EGL_FUNCTIONS=0 CAIRO_HAS_GLX_FUNCTIONS=0 CAIRO_HAS_SCRIPT_SURFACE=0 diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index 2dc43bd17..42a1cf6a7 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -41,6 +41,9 @@ endif ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) @echo "#define CAIRO_HAS_PNG_FUNCTIONS 1" >> src/cairo-features.h endif +ifeq ($(CAIRO_HAS_GL_SURFACE),1) + @echo "#define CAIRO_HAS_GL_SURFACE 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_GLITZ_SURFACE),1) @echo "#define CAIRO_HAS_GLITZ_SURFACE 1" >> src/cairo-features.h endif @@ -50,6 +53,9 @@ endif ifeq ($(CAIRO_HAS_VG_SURFACE),1) @echo "#define CAIRO_HAS_VG_SURFACE 1" >> src/cairo-features.h endif +ifeq ($(CAIRO_HAS_EAGLE_FUNCTIONS),1) + @echo "#define CAIRO_HAS_EAGLE_FUNCTIONS 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_EGL_FUNCTIONS),1) @echo "#define CAIRO_HAS_EGL_FUNCTIONS 1" >> src/cairo-features.h endif diff --git a/build/configure.ac.features b/build/configure.ac.features index e2d3262a2..a06496f1f 100644 --- a/build/configure.ac.features +++ b/build/configure.ac.features @@ -374,6 +374,7 @@ AC_DEFUN([CAIRO_REPORT], echo " PostScript: $use_ps" echo " PDF: $use_pdf" echo " SVG: $use_svg" + echo " OpenGL: $use_gl" echo " glitz: $use_glitz" echo " BeOS: $use_beos" echo " DirectFB: $use_directfb" @@ -387,9 +388,10 @@ AC_DEFUN([CAIRO_REPORT], echo " Quartz: $use_quartz_font" echo "" echo "The following functions:" - echo " PNG functions: $use_png" - echo " GLX functions: $use_glx" - echo " EGL functions: $use_egl" + echo " PNG functions: $use_png" + echo " GLX functions: $use_glx" + echo " EGL functions: $use_egl" + echo " Eagle functions: $use_eagle" echo "" echo "And the following internal features:" echo " gtk-doc: $enable_gtk_doc" |