INTEGRATION: CWS ooo11rc2 (1.13.220); FILE MERGED

2003/07/14 15:10:32 fa 1.13.220.1: Mac OS X compatibility.  Force OS X to use XRenderCompositeString32 since
PORTS moved to that as well, the patch that enabled this on srx644+ is
no longer applicable to PORTS either.  Misc link time additions for
OS X, bring in appropriate headers, etc.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16692

Dan
fa@ooo

vcl/util/makefile.pmk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.13 $
+#   $Revision: 1.14 $
 #
-#   last change: $Author: hr $ $Date: 2002-08-27 18:09:42 $
+#   last change: $Author: hr $ $Date: 2003-07-16 17:47:17 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,10 +64,6 @@ PROJECTPCH=vclpch
 PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
 PDBTARGET=vcl
 
-.IF "$(OS)"=="MACOSX"
-GUIBASE=aqua
-.ENDIF
-
 .IF "$(remote)" != ""
 USE_BUILTIN_RASTERIZER=true
 .ENDIF