INTEGRATION: CWS cairoquartz01 (1.5.12); FILE MERGED

2008/03/27 22:50:18 thb 1.5.12.11: Cleaned up a few warnings, made this (almost) build on win32.
Still missing the cairo_win32_cairo.cxx file.
2008/03/01 09:06:17 mox 1.5.12.10: Add couple of comments to clarify the ifdefs
2008/02/29 16:37:12 thb 1.5.12.9: Fixed build breakage for X11 case
2008/02/29 06:09:05 mox 1.5.12.8: Sync with latest win32 backend changes.
2008/01/14 21:04:52 mox 1.5.12.7: The pixman library is now separate from cairo library.
2007/12/10 17:32:05 mox 1.5.12.6: Updated makefile.mk, works with Cocoa
2007/12/08 21:35:31 mox 1.5.12.5: remove carbon lib include -- handled by solenv in newer milestones.
2007/07/17 22:34:43 mox 1.5.12.4: Rework cross-platform files to be separate for each platform.
The <1.2 API support is now mostly in platform specific files.
2007/06/02 23:05:33 thb 1.5.12.3: #i70519# Merged in tml's fixes for WinCairo; made code compile warning-free under Linux; added prex/postx.h (which where already referenced); cleaned up a bit; replaces plain round() call with basegfx::fround; asserting unexpected/unimplemented case at selected places
2007/05/01 21:21:43 mox 1.5.12.2: urther fixes:
- separate X11 cairo 1.0 API to legacy file: cairo_cairolegacy.cxx.
- maximize the use of crossplatform code
- fix quartz bugs
2007/04/12 20:16:01 mox 1.5.12.1: Issue number:  #69066# initial Cairo Quartz implementation

1 files changed, 35 insertions, 7 deletions

diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk
index 391f15011ac9..079871e55f61 100644
--- a/canvas/source/cairo/makefile.mk
+++ b/canvas/source/cairo/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: rt $ $Date: 2007-01-31 08:35:57 $
+#   last change: $Author: kz $ $Date: 2008-04-02 09:45:37 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -37,6 +37,7 @@ PRJ=..$/..
 
 PRJNAME=canvas
 TARGET=cairocanvas
+TARGETTYPE=GUI
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------------
@@ -52,7 +53,6 @@ DLLPRE =
 
 # --- Common ----------------------------------------------------------
 
-.IF "$(GUI)"=="UNX"
 
 .IF "$(SYSTEM_CAIRO)" == "YES"
 CFLAGS+=$(CAIRO_CFLAGS)
@@ -72,7 +72,6 @@ SLOFILES =	$(SLO)$/cairo_cachedbitmap.obj \
             $(SLO)$/cairo_canvashelper.obj \
             $(SLO)$/cairo_canvashelper_text.obj \
             $(SLO)$/cairo_devicehelper.obj \
-            $(SLO)$/cairo_helper.obj \
             $(SLO)$/cairo_spritecanvas.obj \
             $(SLO)$/cairo_spritecanvashelper.obj \
             $(SLO)$/cairo_spritehelper.obj \
@@ -82,12 +81,42 @@ SHL1TARGET=$(TARGET).uno
 
 SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB)
 
+.IF "$(GUI)"=="UNX" 
+
 .IF "$(SYSTEM_CAIRO)" == "YES"
-SHL1STDLIBS+= $(CAIRO_LIBS) -lX11 -lXrender
+SHL1STDLIBS+= $(CAIRO_LIBS)
+.ELSE
+SHL1STDLIBS+= -lcairo -lpixman-1
+.ENDIF
+
+.IF "$(GUIBASE)"=="aqua"
+# native Mac OS X (Quartz)
+SLOFILES+= $(SLO)$/cairo_quartz_cairo.obj
+OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
+CFLAGSCXX+=$(OBJCXXFLAGS)
 .ELSE
-SHL1STDLIBS+= -lcairo -lX11 -lXrender
+# Xlib
+SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj \
+           $(SLO)$/cairo_xlib_helper.obj
+SHL1STDLIBS+= -lX11 -lXrender
 .ENDIF
 
+.ELSE    # "$(GUI)"=="UNX" 
+
+.IF "$(GUI)"=="WNT"
+SLOFILES+= $(SLO)$/cairo_win32_cairo.obj
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS+= -lcairo -lgdi32 -lmsimg32
+.ELSE
+#We build cairo and pixman as separate (static) libs as I couldn't be
+#bothered to dig into the obscure makefile.mk stuff enough to combine
+#them into one as is normally done.
+SHL1STDLIBS+= cairo.lib pixman.lib gdi32.lib 
+.ENDIF
+.ENDIF
+
+.ENDIF   # "$(GUI)"=="UNX" 
+
 SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
@@ -97,7 +126,6 @@ SHL1VERSIONMAP=exports.map
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
 
-.ENDIF
 
 # ==========================================================================