diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-30 22:46:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-31 09:04:12 +0200 |
| commit | f684dd13292c8e1b8c4d318061c5fb302287d390 (patch) | |
| tree | 03c53e69ff03c69ae8737d5335f76137667cc953 /scp2 | |
| parent | 21ce2a53e518e2e20c7736ef48f978d1e3c1d28b (diff) | |
Do not include cairo lib unless ENABLE_LIBRSVG, among others
(-DENABLE_CAIROCANVAS has apparently been unused.)
Change-Id: Ib65ca0e8f5c8badab1f97e31bc61b1a49dabde76
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index efff291710eb..42fab0ed5de3 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -35,6 +35,7 @@ $(eval $(call gb_InstallModule_use_packages,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ DISABLE_ATL \ DISABLE_NEON \ + ENABLE_CAIRO_CANVAS \ ENABLE_DIRECTX \ ENABLE_EVOAB2 \ ENABLE_GTK \ @@ -143,9 +144,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ )) $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ - $(if $(filter MACOSX,$(OS)),\ - -DENABLE_CAIROCANVAS \ - ) \ $(if $(filter INTERNAL,$(ENABLE_LIBRSVG)),\ -DENABLE_LIBRSVG \ ) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index fea46d3e6289..50bfdaf55c49 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -569,7 +569,10 @@ End #ifndef LIBO_HEADLESS -#ifndef SYSTEM_CAIRO +#if !defined SYSTEM_CAIRO \ + && (defined ENABLE_CAIRO_CANVAS \ + || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG) \ + || (defined WNT && !defined ENABLE_DIRECTX)) File gid_File_Lib_Cairo LIB_FILE_BODY; |