diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-02 00:37:19 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-02 00:56:39 -0700 |
| commit | f59f44c140e5f60d336423e0585d2bb8a6c0ea01 (patch) | |
| tree | b0e1369a4aedfb6ee288fd29264177e881021850 /build/Makefile.win32.features | |
| parent | 2da78fd4666faa27d037ae3625ca83353a6e7629 (diff) | |
| parent | 4232719af968ed05636fe34f2ffe2520dc02d737 (diff) | |
Merge commit 'origin/master' into gl
Felt like pulling the latest stuff, since I branched back in February.
Conflicts:
build/configure.ac.features
src/cairo.h
util/cairo-script/csi-replay.c
Diffstat (limited to 'build/Makefile.win32.features')
| -rw-r--r-- | build/Makefile.win32.features | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index f9e064de..9e722246 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -10,7 +10,6 @@ CAIRO_HAS_WIN32_SURFACE=1 CAIRO_HAS_WIN32_FONT=1 CAIRO_HAS_OS2_SURFACE=0 CAIRO_HAS_BEOS_SURFACE=0 -CAIRO_HAS_SDL_SURFACE=0 CAIRO_HAS_PNG_FUNCTIONS=1 CAIRO_HAS_GL_SURFACE=0 CAIRO_HAS_GL_GLX_SURFACE=0 @@ -19,6 +18,7 @@ CAIRO_HAS_GLITZ_SURFACE=0 CAIRO_HAS_DIRECTFB_SURFACE=0 CAIRO_HAS_SCRIPT_SURFACE=0 CAIRO_HAS_FT_FONT=0 +CAIRO_HAS_FC_FONT=0 CAIRO_HAS_PS_SURFACE=1 CAIRO_HAS_PDF_SURFACE=1 CAIRO_HAS_SVG_SURFACE=1 |