diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-15 11:03:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-15 11:03:52 +0000 |
| commit | 714f7749a4b4f3cc21b10dd08f0b019c24ae23e7 (patch) | |
| tree | da21bcc1dbed33677ec17c85f4606f6ee55e990a | |
| parent | 5177c84393fad8c1c83bea5385ce601c19ecccdb (diff) | |
INTEGRATION: CWS fontconfig (1.4.80); FILE MERGED
2003/08/22 12:22:28 pl 1.4.80.3: use CFLAGS instead of ENVCFLAGS
2003/08/21 14:13:32 pl 1.4.80.2: #i8144# only compile in cups if ENABLE_FONTCONFIG is set
2003/08/20 17:58:34 pl 1.4.80.1: #i8144# add fontconfig support
| -rw-r--r-- | psprint/source/fontmanager/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/psprint/source/fontmanager/makefile.mk b/psprint/source/fontmanager/makefile.mk index caa1416870e1..d56942d4e850 100644 --- a/psprint/source/fontmanager/makefile.mk +++ b/psprint/source/fontmanager/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hr $ $Date: 2002-08-20 15:00:13 $ +# last change: $Author: obo $ $Date: 2004-03-15 12:03:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,17 +66,22 @@ ENABLE_EXCEPTIONS=TRUE PRJNAME=psprint TARGET=fontman -ENVCFLAGS+= -I..$/fontsubset - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +CFLAGS+= -I..$/fontsubset + +.IF "$(ENABLE_FONTCONFIG)" != "" +CDEFS += -DENABLE_FONTCONFIG +.ENDIF + # --- Files -------------------------------------------------------- SLOFILES=\ $(SLO)$/fontmanager.obj \ $(SLO)$/fontcache.obj \ + $(SLO)$/fontconfig.obj \ $(SLO)$/parseAFM.obj .IF "$(OS)$(CPU)"=="SOLARISI" |