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 /scp2 | |
| parent | 04da22088ebbe5418c9d14c31f52a0d7f42abcc0 (diff) | |
make cairo an unconditional requirement for text rendering
Diffstat (limited to 'scp2')
| -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 |
4 files changed, 15 insertions, 14 deletions
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 |