diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:25:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:25:01 +0000 |
| commit | eee98956afba29acc035fcc3f31c62406e2b55c2 (patch) | |
| tree | 3e68448334c0786fd26686fbcb308ddd8f594005 /sc/util/makefile.mk | |
| parent | 545512fb42ba6cb05a13a36542aca77596513d29 (diff) | |
INTEGRATION: CWS sb83 (1.44.94); FILE MERGED
2008/03/17 11:01:32 sb 1.44.94.4: fixed previous fix
2008/03/17 10:11:01 sb 1.44.94.3: #i84200# avoid build break on Mac OS X (see commit comment for 1.44.94.1)
2008/03/17 09:14:26 sb 1.44.94.2: RESYNC: (1.44-1.45); FILE MERGED
2008/03/07 08:22:41 sb 1.44.94.1: #i84200# marked the shared lib that goes into oovbaapi.oxt as RPATH=OXT, though that is not enought to make it work, at least on Mac OS X, as the lib links against non-URE libs (like VCLLIB)
Diffstat (limited to 'sc/util/makefile.mk')
| -rw-r--r-- | sc/util/makefile.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 201dd68c709b..d0ed9816a214 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.45 $ +# $Revision: 1.46 $ # -# last change: $Author: obo $ $Date: 2008-02-25 17:12:59 $ +# last change: $Author: vg $ $Date: 2008-03-18 14:25:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -254,7 +254,9 @@ LIB8OBJFILES = \ $(SLO)$/dpgroupdlg.obj \ $(SLO)$/editfield.obj -.IF "$(ENABLE_VBA)"=="YES" +# SHL9RPATH=OXT and SHL9STDLIBS containing non-URE libs does not work reliably +# anywhere, and would break the build on MACOSX: +.IF "$(ENABLE_VBA)"=="YES" && "$(OS)" != "MACOSX" TARGET_VBA=vbaobj SHL9TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno @@ -263,6 +265,7 @@ SHL9IMPLIB= i$(TARGET_VBA) SHL9VERSIONMAP=$(TARGET_VBA).map SHL9DEF=$(MISC)$/$(SHL9TARGET).def DEF9NAME=$(SHL9TARGET) +SHL9RPATH=OXT SHL9STDLIBS= \ $(CPPUHELPERLIB) \ @@ -298,7 +301,7 @@ SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib .INCLUDE : target.mk -.IF "$(VBA_EXTENSION)"=="YES" +.IF "$(VBA_EXTENSION)"=="YES" && "$(OS)" != "MACOSX" # see above COMP=build_extn .ENDIF |