summaryrefslogtreecommitdiff
path: root/UnoControls/source
diff options
context:
space:
mode:
Diffstat (limited to 'UnoControls/source')
-rw-r--r--UnoControls/source/base/makefile.mk11
-rw-r--r--UnoControls/source/controls/makefile.mk11
2 files changed, 18 insertions, 4 deletions
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
index 584aefb810ec..266225ff1109 100644
--- a/UnoControls/source/base/makefile.mk
+++ b/UnoControls/source/base/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:11:17 $
+# last change: $Author: pluby $ $Date: 2000-10-06 16:30:31 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -78,6 +78,13 @@ SLOFILES= $(SLO)$/multiplexer.obj \
$(SLO)$/basecontainercontrol.obj \
$(SLO)$/registercontrols.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)$/staticmbbase.obj
+.ENDIF
+
#LIB1TARGET= $(SLB)$/$(TARGET).lib
#LIB1OBJFILES= $(SLOFILES)
diff --git a/UnoControls/source/controls/makefile.mk b/UnoControls/source/controls/makefile.mk
index 2de3bb05b4ca..b51357cc27de 100644
--- a/UnoControls/source/controls/makefile.mk
+++ b/UnoControls/source/controls/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:11:17 $
+# last change: $Author: pluby $ $Date: 2000-10-06 16:30:31 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -76,5 +76,12 @@ SLOFILES=\
$(SLO)$/OConnectionPointHelper.obj \
$(SLO)$/OConnectionPointContainerHelper.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)$/staticmbcontrols.obj
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk