diff options
| author | Patrick Luby <pluby@openoffice.org> | 2000-10-10 02:19:11 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2000-10-10 02:19:11 +0000 |
| commit | 75c5d408572002000c9f1c7a832ecc351da43eaf (patch) | |
| tree | 3d272abb899bfe44c3b0e474d647ebd9f9990f1a /javaunohelper/source | |
| parent | c28ad9bf80ea2a4227e52cc9f8dea1c9fcdb83ea (diff) | |
Added initialization of static data members for template classes for Mac OS X
Diffstat (limited to 'javaunohelper/source')
| -rw-r--r-- | javaunohelper/source/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk index a9736781b961..24242f454a62 100644 --- a/javaunohelper/source/makefile.mk +++ b/javaunohelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 16:31:32 $ +# last change: $Author: pluby $ $Date: 2000-10-10 03:19:11 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -105,6 +105,13 @@ UNOTYPES= \ SLOFILES= \ $(SLO)$/javaunohelper.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= \ |