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/source/canvas | |
| parent | 04da22088ebbe5418c9d14c31f52a0d7f42abcc0 (diff) | |
make cairo an unconditional requirement for text rendering
Diffstat (limited to 'scp2/source/canvas')
| -rw-r--r-- | scp2/source/canvas/makefile.mk | 6 |
1 files changed, 5 insertions, 1 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 |