diff options
author | Patrick Luby <pluby@openoffice.org> | 2000-10-07 20:13:53 +0000 |
---|---|---|
committer | Patrick Luby <pluby@openoffice.org> | 2000-10-07 20:13:53 +0000 |
commit | d6b44eb02e53e6e5f4e7d8d390768fbfd64b815a (patch) | |
tree | 88ef0d5582bde94b2919eb292dad2391003b0cad /comphelper | |
parent | a522f25e656944d4474d05f23d9eeeee6adebd83 (diff) |
Added initialization of static data members for template classes for Mac OS X
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/source/container/makefile.mk | 11 | ||||
-rw-r--r-- | comphelper/source/eventattachermgr/makefile.mk | 11 | ||||
-rw-r--r-- | comphelper/source/property/makefile.mk | 11 | ||||
-rw-r--r-- | comphelper/source/streaming/makefile.mk | 11 |
4 files changed, 36 insertions, 8 deletions
diff --git a/comphelper/source/container/makefile.mk b/comphelper/source/container/makefile.mk index fa119434db7c..a0de9408c587 100644 --- a/comphelper/source/container/makefile.mk +++ b/comphelper/source/container/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: fs $ $Date: 2000-09-29 11:28:15 $ +# last change: $Author: pluby $ $Date: 2000-10-07 21:13:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -77,6 +77,13 @@ SLOFILES=\ $(SLO)$/enumhelper.obj \ $(SLO)$/container.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)$/staticmbcontainer.obj +.ENDIF + # --- Targets ---------------------------------- .INCLUDE : target.mk diff --git a/comphelper/source/eventattachermgr/makefile.mk b/comphelper/source/eventattachermgr/makefile.mk index 0a941cc95354..a7b82a524907 100644 --- a/comphelper/source/eventattachermgr/makefile.mk +++ b/comphelper/source/eventattachermgr/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: fs $ $Date: 2000-09-29 11:28:15 $ +# last change: $Author: pluby $ $Date: 2000-10-07 21:13:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -103,6 +103,13 @@ ENABLE_EXCEPTIONS=TRUE SLOFILES= $(SLO)$/eventattachermgr.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)$/staticmbeventattachermgr.obj +.ENDIF + # --- Targets ---------------------------------- .INCLUDE : target.mk diff --git a/comphelper/source/property/makefile.mk b/comphelper/source/property/makefile.mk index 191aa0fe3d51..737208320728 100644 --- a/comphelper/source/property/makefile.mk +++ b/comphelper/source/property/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: fs $ $Date: 2000-09-29 11:28:15 $ +# last change: $Author: pluby $ $Date: 2000-10-07 21:13:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,6 +79,13 @@ SLOFILES= $(SLO)$/propagg.obj \ $(SLO)$/propstate.obj \ $(SLO)$/propertycontainer.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)$/staticmbproperty.obj +.ENDIF + # --- Targets ---------------------------------- .INCLUDE : target.mk diff --git a/comphelper/source/streaming/makefile.mk b/comphelper/source/streaming/makefile.mk index 891c4d5203fd..6696b506708d 100644 --- a/comphelper/source/streaming/makefile.mk +++ b/comphelper/source/streaming/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: fs $ $Date: 2000-09-29 11:28:15 $ +# last change: $Author: pluby $ $Date: 2000-10-07 21:13:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -77,6 +77,13 @@ SLOFILES= $(SLO)$/basicio.obj \ $(SLO)$/seqstream.obj \ $(SLO)$/streamsection.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)$/staticmbstreaming.obj +.ENDIF + # --- Targets ---------------------------------- .INCLUDE : target.mk |