fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-21 03:58:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[build] Add a default message for when GLEW isn't built

Browse source 
And it appears I touched the build system again and autoregenerated the
feature headers.
This commit is contained in:
Chris Wilson 2009-09-14 10:08:57 +01:00
parent 6d4f3c40ef
commit 9c2790ccc4
5 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boilerplate/Makefile.win32.features
View file

@ -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)

1
build/Makefile.win32.features-h
View file

@ -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

5
configure.ac
View file

@ -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

8
src/Makefile.win32.features
View file

@ -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)

1
util/cairo.modules
View file

@ -18,6 +18,7 @@
<dependencies>
<dep package="pixman"/>
<dep package="fontconfig"/>
<dep package="libGL"/>
<dep package="glitz"/>
</dependencies>
<after>