diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-01-25 12:00:45 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-01-25 12:00:45 +0100 |
| commit | 554bcf4205ede6ec3adb9f39e676b77054b1e8a1 (patch) | |
| tree | 9e9a9f68d021f0455dde06c69b48127617efec38 /scp2 | |
| parent | 400ad00534afbbc93de9fd0835e487980f85a336 (diff) | |
Fix file not found: cairocanvas.uno.so in smoketestoo_native
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/canvas/makefile.mk | 5 | ||||
| -rw-r--r-- | scp2/util/makefile.mk | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk index 7ce0257c58a4..d0d8362513e9 100644 --- a/scp2/source/canvas/makefile.mk +++ b/scp2/source/canvas/makefile.mk @@ -41,12 +41,9 @@ PARFILES= canvascommons.par \ vclcanvas.par \ mtfrenderer.par -.IF "$(GUI)"=="UNX" -#X11 MacOSX has no cairo-canvas -.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" +.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE" PARFILES+= cairocanvas.par .ENDIF -.ENDIF .IF "$(ENABLE_DIRECTX)" != "" .IF "$(USE_DIRECTX5)" != "" diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 74b45a8d8519..7de0c6c0dd32 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -209,12 +209,9 @@ SCP1FILES += \ vclcanvas.par \ mtfrenderer.par -.IF "$(GUI)"=="UNX" -#X11 MacOSX has no cairo-canvas -.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" +.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE" SCP1FILES += cairocanvas.par .ENDIF -.ENDIF .IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP1FILES += \ |