diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 13:32:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 13:32:07 +0000 |
| commit | ddb67ff3f2ccded57096018e45b17f34c8019cf2 (patch) | |
| tree | ec2853b53ca1855f9f79b56f78644389c14aae9a | |
| parent | 6209de43601ba0e9f7e74b2c05ff87c3dd05ddd2 (diff) | |
INTEGRATION: CWS rmfreetype (1.13.60); FILE MERGED
2008/07/28 11:01:37 obr 1.13.60.1: #i52025#,#i52026# system freetype no longer optional
| -rw-r--r-- | vcl/source/glyphs/makefile.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk index 3c6b76ffef18..b08777d7020f 100644 --- a/vcl/source/glyphs/makefile.mk +++ b/vcl/source/glyphs/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # # This file is part of OpenOffice.org. # @@ -41,12 +41,10 @@ ENABLE_EXCEPTIONS=true .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile2.pmk -.IF "$(SYSTEM_FREETYPE)" == "YES" -CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) +CFLAGS+= $(FREETYPE_CFLAGS) .IF "$(USE_FT_EMBOLDEN)" == "YES" CFLAGS+=-DUSE_FT_EMBOLDEN .ENDIF -.ENDIF # --- Files -------------------------------------------------------- |