From a1ecc5df539ea17ba6deb1960412c6f6e3627e26 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Sun, 30 Nov 2008 07:56:43 +0000 Subject: CWS-TOOLING: integrate CWS cairosource01 2008-11-28 13:29:24 +0100 rene r264546 : i96634# add patch from kendy fixing --disable-mozilla with the new mozbootstrap stuff 2008-11-28 12:43:54 +0100 rene r264540 : revert commit to wrong branch 2008-11-28 11:52:54 +0100 rene r264537 : #ii10000# work around gcc taking hours/OOMing with qnametostr.cxx 2008-11-24 21:40:36 +0100 mox r264268 : Remove the support for pre-built binaries, now that cairo can be built from source 2008-11-24 21:39:01 +0100 mox r264267 : Remove the support for pre-built binaries, now that cairo can be built from source 2008-11-14 22:25:27 +0100 mox r263699 : Fix build breakers on vanilla Win32 2008-11-10 19:45:48 +0100 mox r263538 : Try to fix build breaker 2008-11-09 10:48:43 +0100 mox r263493 : Full pixman_CFLAGS and pixman_LIBS are needed for configure to work properly on UNX. 2008-11-08 20:24:06 +0100 mox r263491 : Patch for pixman is still needed to fix build breakers in VM with Linux/FreeBSD 2008-11-05 21:29:44 +0100 mox r263358 : CWS-TOOLING: rebase CWS cairosource01 to trunk@263288 (milestone: DEV300:m35) 2008-11-03 20:36:48 +0100 mox r263306 : Update cairo sources missing from migration. 2008-11-03 20:33:17 +0100 mox r263305 : Migrate CWS cairosource01 to SVN. --- scp2/source/canvas/cairocanvas.scp | 8 -------- scp2/source/ooo/file_library_ooo.scp | 20 ++++++++++++++++++++ scp2/source/ooo/makefile.mk | 4 ++++ 3 files changed, 24 insertions(+), 8 deletions(-) (limited to 'scp2/source') 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 -- cgit v1.2.3