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-h | |
| 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-h')
| -rw-r--r-- | build/Makefile.win32.features-h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index da80593d6..57514b48f 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -35,9 +35,6 @@ endif ifeq ($(CAIRO_HAS_BEOS_SURFACE),1) @echo "#define CAIRO_HAS_BEOS_SURFACE 1" >> src/cairo-features.h endif -ifeq ($(CAIRO_HAS_SDL_SURFACE),1) - @echo "#define CAIRO_HAS_SDL_SURFACE 1" >> src/cairo-features.h -endif ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) @echo "#define CAIRO_HAS_PNG_FUNCTIONS 1" >> src/cairo-features.h endif @@ -62,6 +59,9 @@ endif ifeq ($(CAIRO_HAS_FT_FONT),1) @echo "#define CAIRO_HAS_FT_FONT 1" >> src/cairo-features.h endif +ifeq ($(CAIRO_HAS_FC_FONT),1) + @echo "#define CAIRO_HAS_FC_FONT 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_PS_SURFACE),1) @echo "#define CAIRO_HAS_PS_SURFACE 1" >> src/cairo-features.h endif |