diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-14 16:05:14 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-14 16:05:14 +0100 |
commit | 072a200ec502bf5ac3e62702e6f14ed18171b1e0 (patch) | |
tree | 6c3946cae9d67578c567d73d9eb124636eb8d267 | |
parent | 4a0bd91ff77c8afddde6d09495bc9ca7242f953d (diff) |
build: Add wgl to Makefile.sources and regenerate features.
-rw-r--r-- | boilerplate/Makefile.win32.features | 10 | ||||
-rw-r--r-- | build/Makefile.win32.features | 1 | ||||
-rw-r--r-- | build/Makefile.win32.features-h | 3 | ||||
-rw-r--r-- | src/Makefile.sources | 6 | ||||
-rw-r--r-- | src/Makefile.win32.features | 14 |
5 files changed, 32 insertions, 2 deletions
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 2a27d6bd..fd0e9c73 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -259,6 +259,16 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_glx_private) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glx_sources) endif +supported_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers) +all_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers) +all_cairo_boilerplate_private += $(cairo_boilerplate_wgl_private) +all_cairo_boilerplate_sources += $(cairo_boilerplate_wgl_sources) +ifeq ($(CAIRO_HAS_WGL_FUNCTIONS),1) +enabled_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_wgl_private) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_wgl_sources) +endif + unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_script_private) diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index 5c283ac4..1d6fd8cb 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -24,6 +24,7 @@ CAIRO_HAS_DIRECTFB_SURFACE=0 CAIRO_HAS_VG_SURFACE=0 CAIRO_HAS_EGL_FUNCTIONS=0 CAIRO_HAS_GLX_FUNCTIONS=0 +CAIRO_HAS_WGL_FUNCTIONS=0 CAIRO_HAS_SCRIPT_SURFACE=0 CAIRO_HAS_FT_FONT=0 CAIRO_HAS_FC_FONT=0 diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index 1e66889e..9d9468cd 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -77,6 +77,9 @@ endif ifeq ($(CAIRO_HAS_GLX_FUNCTIONS),1) @echo "#define CAIRO_HAS_GLX_FUNCTIONS 1" >> src/cairo-features.h endif +ifeq ($(CAIRO_HAS_WGL_FUNCTIONS),1) + @echo "#define CAIRO_HAS_WGL_FUNCTIONS 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1) @echo "#define CAIRO_HAS_SCRIPT_SURFACE 1" >> src/cairo-features.h endif diff --git a/src/Makefile.sources b/src/Makefile.sources index 6e7c511b..7b661486 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -194,8 +194,9 @@ _cairo_font_subset_sources = \ cairo_private += $(_cairo_font_subset_private) cairo_sources += $(_cairo_font_subset_sources) -cairo_glx_sources = cairo_egl_sources = +cairo_glx_sources = +cairo_wgl_sources = _cairo_pdf_operators_private = cairo-pdf-operators-private.h _cairo_pdf_operators_sources = cairo-pdf-operators.c @@ -322,8 +323,9 @@ cairo_gl_sources = cairo-gl-composite.c \ cairo-gl-shaders.c \ cairo-gl-surface.c -cairo_glx_sources += cairo-glx-context.c cairo_egl_sources += cairo-egl-context.c +cairo_glx_sources += cairo-glx-context.c +cairo_wgl_sources += cairo-wgl-context.c cairo_directfb_headers = cairo-directfb.h cairo_directfb_sources = cairo-directfb-surface.c diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features index a4efe77c..3cbdd2e3 100644 --- a/src/Makefile.win32.features +++ b/src/Makefile.win32.features @@ -357,6 +357,20 @@ ifeq ($(CAIRO_HAS_GLX_FUNCTIONS),1) enabled_cairo_pkgconf += cairo-glx.pc endif +supported_cairo_headers += $(cairo_wgl_headers) +all_cairo_headers += $(cairo_wgl_headers) +all_cairo_private += $(cairo_wgl_private) +all_cairo_sources += $(cairo_wgl_sources) +ifeq ($(CAIRO_HAS_WGL_FUNCTIONS),1) +enabled_cairo_headers += $(cairo_wgl_headers) +enabled_cairo_private += $(cairo_wgl_private) +enabled_cairo_sources += $(cairo_wgl_sources) +endif +all_cairo_pkgconf += cairo-wgl.pc +ifeq ($(CAIRO_HAS_WGL_FUNCTIONS),1) +enabled_cairo_pkgconf += cairo-wgl.pc +endif + unsupported_cairo_headers += $(cairo_script_headers) all_cairo_headers += $(cairo_script_headers) all_cairo_private += $(cairo_script_private) |