diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:48:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:48:03 +0000 |
| commit | df6004340d7f2535c64901694ce2ce051ecb809b (patch) | |
| tree | 345db1c3ccbe5d05f7d1acceb439b3633543e7a2 /scp2 | |
| parent | 1e200d8219983beaf346322e3021824b5732dc83 (diff) | |
INTEGRATION: CWS cairocanvas (1.35.76); FILE MERGED
2006/01/27 13:19:45 thb 1.35.76.2: RESYNC: (1.35-1.38); FILE MERGED
2005/11/09 13:00:28 radekdoulik 1.35.76.1: Issue number: #51657
Submitted by: radekdoulik
Reviewed by: radekdoulik
scp2 changes to include cairo canvas component in serveces.rdb
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 2d7770a1665e..6eb5ef95ffaf 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.39 $ +# $Revision: 1.40 $ # -# last change: $Author: rt $ $Date: 2006-02-09 17:06:57 $ +# last change: $Author: kz $ $Date: 2006-02-28 10:48:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -95,6 +95,10 @@ SCPDEFS+=-DENABLE_DIRECTX SCPDEFS+=-DSYSTEM_FREETYPE .ENDIF +.IF "$(SYSTEM_CAIRO)" == "YES" +SCPDEFS+=-DSYSTEM_CAIRO +.ENDIF + .IF "$(SYSTEM_LIBXML)" == "YES" SCPDEFS+=-DSYSTEM_LIBXML .ENDIF @@ -147,6 +151,10 @@ SCPDEFS+=-DSYSTEM_HUNSPELL SCPDEFS+=-DSYSTEM_XALAN .ENDIF +.IF "$(ENABLE_CAIRO)" == "TRUE" +SCPDEFS+=-DENABLE_CAIRO +.ENDIF + SCPDEFS+=\ -DICU_MAJOR=$(ICU_MAJOR) \ -DICU_MINOR=$(ICU_MINOR) \ |