diff options
| -rw-r--r-- | boilerplate/Makefile.win32.features | 8 | ||||
| -rw-r--r-- | build/Makefile.win32.features-h | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.win32.features | 8 | ||||
| -rw-r--r-- | util/cairo.modules | 1 |
5 files changed, 4 insertions, 19 deletions
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 5f8018c2..3e922efb 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -169,14 +169,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_png_private) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources) endif -supported_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers) -all_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers) -all_cairo_boilerplate_private += $(cairo_boilerplate_glew_private) -all_cairo_boilerplate_sources += $(cairo_boilerplate_glew_sources) -enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers) -enabled_cairo_boilerplate_private += $(cairo_boilerplate_glew_private) -enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glew_sources) - 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-h b/build/Makefile.win32.features-h index e49f6b06..8585498a 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -50,7 +50,6 @@ endif ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) @echo "#define CAIRO_HAS_PNG_FUNCTIONS 1" >> src/cairo-features.h endif - @echo "#define CAIRO_HAS_GLEW_FUNCTIONS 1" >> src/cairo-features.h ifeq ($(CAIRO_HAS_GL_SURFACE),1) @echo "#define CAIRO_HAS_GL_SURFACE 1" >> src/cairo-features.h endif diff --git a/configure.ac b/configure.ac index ba4a49d3..b4b1cc37 100644 --- a/configure.ac +++ b/configure.ac @@ -240,6 +240,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [ ]) dnl =========================================================================== +use_glew="no (not required by any backend)" CAIRO_ENABLE_SURFACE_BACKEND(gl, OpenGL, no, [ gl_REQUIRES="gl" PKG_CHECK_MODULES(gl, $gl_REQUIRES,, [ @@ -255,10 +256,10 @@ CAIRO_ENABLE_SURFACE_BACKEND(gl, OpenGL, no, [ [AC_CHECK_HEADER(GL/glew.h, [have_glew="yes"], [])]) if test "x$have_glew" = "xyes"; then gl_NONPKGCONFIG_LIBS="-lGLEW $gl_NONPKGCONFIG_LIBS" - use_glew="system library" + use_glew="yes (system library)" else CAIRO_ENABLE_FUNCTIONS(glew, GLEW, always) - use_glew="private copy" + use_glew="yes (private copy)" CAIRO_CFLAGS="$CAIRO_CFLAGS -I\$(top_srcdir)/src/glew" fi need_glx_functions=yes diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features index ef72524c..4e55642d 100644 --- a/src/Makefile.win32.features +++ b/src/Makefile.win32.features @@ -231,14 +231,6 @@ ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) enabled_cairo_pkgconf += cairo-png.pc endif -supported_cairo_headers += $(cairo_glew_headers) -all_cairo_headers += $(cairo_glew_headers) -all_cairo_private += $(cairo_glew_private) -all_cairo_sources += $(cairo_glew_sources) -enabled_cairo_headers += $(cairo_glew_headers) -enabled_cairo_private += $(cairo_glew_private) -enabled_cairo_sources += $(cairo_glew_sources) - unsupported_cairo_headers += $(cairo_gl_headers) all_cairo_headers += $(cairo_gl_headers) all_cairo_private += $(cairo_gl_private) diff --git a/util/cairo.modules b/util/cairo.modules index b83114d4..d41ea1b6 100644 --- a/util/cairo.modules +++ b/util/cairo.modules @@ -18,6 +18,7 @@ <dependencies> <dep package="pixman"/> <dep package="fontconfig"/> + <dep package="libGL"/> <dep package="glitz"/> </dependencies> <after> |