diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:52:58 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:52:58 +0000 |
| commit | 82b175244d80ccbd1729f32267afd175c060bd71 (patch) | |
| tree | 4222005fa5e7a415ac745b0e4e23da9980fab7f0 /extensions/source/plugin/util | |
| parent | e23c8e93557ccad5eb9a361ee519443287e587dd (diff) | |
INTEGRATION: CWS aquavcl01 (1.12.82); FILE MERGED
2007/04/11 08:04:08 pjanik 1.12.82.4: RESYNC: (1.13-1.14); FILE MERGED
2006/09/22 08:14:13 ericb 1.12.82.3: does complete #i62119# fix mozilla plugin issue on Mac OS X building or not mozilla plugin
2006/03/10 14:26:33 tra 1.12.82.2: RESYNC: (1.12-1.13); FILE MERGED
2006/01/31 00:36:17 fheckl 1.12.82.1: Allowing a full aqua build
Diffstat (limited to 'extensions/source/plugin/util')
| -rw-r--r-- | extensions/source/plugin/util/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk index 69b89a6a700b..8e54949c9b74 100644 --- a/extensions/source/plugin/util/makefile.mk +++ b/extensions/source/plugin/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: vg $ $Date: 2007-03-26 13:10:14 $ +# last change: $Author: rt $ $Date: 2007-07-05 08:52:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,13 @@ LIB1FILES = \ $(SHL1LINKLIB) .IF "$(GUI)" == "UNX" +.IF "$(GUIBASE)"=="aqua" +.IF "$(WITH_MOZILLA)"=="YES" +SHL1LINKLIB = $(SLB)$/plaqua.lib +.ENDIF +.ELSE SHL1LINKLIB = $(SLB)$/plunx.lib +.ENDIF # $(GUIBASE)==aqua .IF "$(OS)" == "SOLARIS" SHL1OWNLIBS = -lsocket .ENDIF # SOLARIS @@ -94,7 +100,7 @@ SHL1STDLIBS+= \ $(CPPULIB) \ $(SALLIB) -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" && "$(GUIBASE)"=="unx" SHL1STDLIBS+= -lX11 .ENDIF |