summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/canvas/cairocanvas.scp8
-rw-r--r--scp2/source/ooo/file_library_ooo.scp20
-rw-r--r--scp2/source/ooo/makefile.mk4
3 files changed, 24 insertions, 8 deletions
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index 22903da4dbbc..51ee7863dd9c 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -42,11 +42,3 @@ File gid_File_Lib_CairoCanvas
#endif
End
-#ifdef WNT
-File gid_File_Lib_Cairo
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
- Name = "libcairo-2.dll";
-End
-#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6f0c52b4a8f0..bd94aca8628f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -588,6 +588,26 @@ End
SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
+
+#if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO))
+
+File gid_File_Lib_Cairo
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Program;
+ #ifdef UNX
+ #ifdef MACOSX
+ Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
+ #endif
+ #elif defined(WNT)
+ Name = "cairo.dll";
+ #endif
+End
+
+#endif
+
STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm)
SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 882e2299faf9..77e65540e93d 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -99,6 +99,10 @@ SCPDEFS+=-DSYSTEM_FREETYPE
SCPDEFS+=-DSYSTEM_CAIRO
.ENDIF
+.IF "$(ENABLE_CAIRO)" == "YES"
+SCPDEFS+=-DENABLE_CAIRO
+.ENDIF
+
.IF "$(SYSTEM_LIBXML)" == "YES"
SCPDEFS+=-DSYSTEM_LIBXML
.ENDIF