diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-01-16 14:25:20 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-01-16 14:25:20 +0000 |
| commit | fa01671f0a42c3bef5cbb976e238f59865387eca (patch) | |
| tree | f9e5ff6ed7816a627a512f39ed7d400787f24c02 /fileaccess | |
| parent | 0a3fa77c548e2864975b8ad4af7679f2bd42744c (diff) | |
instantiate static member - macosx
Diffstat (limited to 'fileaccess')
| -rw-r--r-- | fileaccess/source/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk index d1b434da8841..f709487923df 100644 --- a/fileaccess/source/makefile.mk +++ b/fileaccess/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: obo $ $Date: 2000-10-31 13:13:38 $ +# last change: $Author: hjs $ $Date: 2001-01-16 15:25:20 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,6 +79,13 @@ SLOFILES= \ $(SLO)$/FileAccess.obj # $(SLO)$/$(COMP1TYPELIST)_description.obj +# NETBSD: somewhere we have to instantiate the static data members. +# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work. +# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols +.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +SLOFILES+=$(SLO)$/staticmb.obj +.ENDIF + SHL1TARGET= $(TARGET) SHL1STDLIBS= \ |