strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added initialization of Sequence<X>::s_pType static data members for Mac OS X

Browse source
This commit is contained in:
Patrick Luby 2000-10-06 15:30:31 +00:00
parent 6b518cfbeb
commit c68f4b7271
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
UnoControls/source/base/makefile.mk
View file

@ -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)

11
UnoControls/source/controls/makefile.mk
View file

@ -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