diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-29 16:22:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-30 11:32:27 +0100 |
| commit | 4e674ab45bde89fd10f94c8357c4c5697540d04f (patch) | |
| tree | e2dfdc1ddf8a24c634d832227628e6dc0b66b52a /RepositoryFixes.mk | |
| parent | 04da22088ebbe5418c9d14c31f52a0d7f42abcc0 (diff) | |
make cairo an unconditional requirement for text rendering
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 0aa4467c7e56..4d2939b9cc61 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -45,6 +45,7 @@ endif ifeq ($(OS),WNT) ifeq ($(COM),GCC) +gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:libcairo$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) @@ -76,6 +77,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) else +gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:libcairo%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES)) @@ -147,6 +149,10 @@ gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilt # we do not require a known rule for these, when using system libs +ifeq ($(SYSTEM_CAIRO),YES) +gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS)) +endif + ifeq ($(SYSTEM_LIBXML),YES) gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS)) endif |