diff options
Diffstat (limited to 'scp2/source/ooo/makefile.mk')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 16 |
1 files changed, 5 insertions, 11 deletions
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 |