diff options
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | RepositoryFixes.mk | 6 | ||||
-rwxr-xr-x | configure.in | 8 | ||||
-rw-r--r-- | scp2/source/canvas/makefile.mk | 6 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/makefile.mk | 16 | ||||
-rw-r--r-- | scp2/util/makefile.mk | 5 | ||||
-rwxr-xr-x | set_soenv.in | 1 |
8 files changed, 22 insertions, 23 deletions
diff --git a/Repository.mk b/Repository.mk index f01ace1f77b2..4e00fb495f1f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -133,6 +133,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ test \ + cairo \ cppunit \ crypto \ fileacc \ 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 diff --git a/configure.in b/configure.in index bda4ecee7f9d..e21c5fea8d40 100755 --- a/configure.in +++ b/configure.in @@ -6520,10 +6520,6 @@ dnl =================================================================== dnl Test whether to build cairo or rely on the system version dnl =================================================================== -dnl ENABLE_CAIRO will be set to empty later when necessary -ENABLE_CAIRO="TRUE" - -BUILD_PIXMAN="" SYSTEM_CAIRO="" AC_MSG_CHECKING([whether to use the system cairo]) @@ -6554,11 +6550,8 @@ int main(int argc, char **argv) { else AC_MSG_RESULT([no]) BUILD_TYPE="$BUILD_TYPE CAIRO" - BUILD_PIXMAN=YES fi -AC_SUBST(ENABLE_CAIRO) -AC_SUBST(BUILD_PIXMAN) AC_SUBST(SYSTEM_CAIRO) AC_SUBST(CAIRO_CFLAGS) AC_SUBST(CAIRO_LIBS) @@ -8048,7 +8041,6 @@ internal) no) ENABLE_LIBRSVG=NO SYSTEM_LIBRSVG=NO - ENABLE_CAIRO= ;; *) diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk index fe6d56460d5f..8e59d7731ae2 100644 --- a/scp2/source/canvas/makefile.mk +++ b/scp2/source/canvas/makefile.mk @@ -43,9 +43,13 @@ PARFILES= canvascommons.par \ vclcanvas.par \ mtfrenderer.par -.IF "$(ENABLE_CAIRO)" == "TRUE" +.IF "$(GUI)"=="UNX" +#X11 MacOSX has no cairo-canvas +.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" PARFILES+= cairocanvas.par .ENDIF +.ENDIF + .IF "$(ENABLE_DIRECTX)" != "" .IF "$(USE_DIRECTX5)" != "" SCPDEFS+=-DUSE_DIRECTX5 diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index d7c81a6d74f7..905bbaac8593 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -572,7 +572,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) -#if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO)) +#ifndef SYSTEM_CAIRO File gid_File_Lib_Cairo TXT_FILE_BODY; diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 1504a2ac14f0..8fc9ad5a924b 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -95,18 +95,17 @@ SCPDEFS+=-DENABLE_EVOAB2 SCPDEFS+=-DENABLE_DIRECTX .ENDIF -.IF "$(SYSTEM_FREETYPE)" == "YES" -SCPDEFS+=-DSYSTEM_FREETYPE +.IF "$(GUI)"=="UNX" +#X11 MacOSX has no cairo-canvas +.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" +SCPDEFS+=-DENABLE_CAIROCANVAS +.ENDIF .ENDIF .IF "$(SYSTEM_CAIRO)" == "YES" SCPDEFS+=-DSYSTEM_CAIRO .ENDIF -.IF "$(ENABLE_CAIRO)" == "YES" -SCPDEFS+=-DENABLE_CAIRO -.ENDIF - .IF "$(SYSTEM_LIBXML)" == "YES" SCPDEFS+=-DSYSTEM_LIBXML .ENDIF @@ -184,11 +183,6 @@ SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\" SCPDEFS+=-DGCJ .ENDIF - -.IF "$(ENABLE_CAIRO)" == "TRUE" -SCPDEFS+=-DENABLE_CAIRO -.ENDIF - .IF "$(SYSTEM_LUCENE)" == "YES" SCPDEFS+=-DSYSTEM_LUCENE .ENDIF diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 90306993b11f..8e1c8f293492 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -207,9 +207,12 @@ SCP1FILES += \ vclcanvas.par \ mtfrenderer.par -.IF "$(ENABLE_CAIRO)" == "TRUE" +.IF "$(GUI)"=="UNX" +#X11 MacOSX has no cairo-canvas +.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" SCP1FILES += cairocanvas.par .ENDIF +.ENDIF .IF "$(ENABLE_LAYOUT)" == "TRUE" SCP1FILES += layout.par diff --git a/set_soenv.in b/set_soenv.in index 4378bb88e417..6f3076b67303 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1930,7 +1930,6 @@ ToFile( "POPPLER_LIBS", "@POPPLER_LIBS@", "e" ); ToFile( "GSTREAMER_CFLAGS", "@GSTREAMER_CFLAGS@", "e" ); ToFile( "GSTREAMER_LIBS", "@GSTREAMER_LIBS@", "e" ); ToFile( "SYSTEM_CAIRO", "@SYSTEM_CAIRO@", "e" ); -ToFile( "BUILD_PIXMAN", "@BUILD_PIXMAN@", "e" ); ToFile( "CAIRO_CFLAGS", "@CAIRO_CFLAGS@", "e" ); ToFile( "CAIRO_LIBS", "@CAIRO_LIBS@", "e" ); ToFile( "XRANDR_CFLAGS", "@XRANDR_CFLAGS@", "e" ); |