diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-01-16 11:04:17 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-01-16 11:04:17 +0000 |
commit | 19c5040d713125f6c53d064522678e4af20a9116 (patch) | |
tree | f9b66f701137dfb65c26086f79dd8118e58077b0 | |
parent | a35ccd36127fbcf5a33894fc09ec54443306487c (diff) |
static member instantiation
-rwxr-xr-x | remotebridges/source/dynamicloader/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/remotebridges/source/dynamicloader/makefile.mk b/remotebridges/source/dynamicloader/makefile.mk index 6344974c1879..b755476914b4 100755 --- a/remotebridges/source/dynamicloader/makefile.mk +++ b/remotebridges/source/dynamicloader/makefile.mk @@ -3,8 +3,8 @@ #* $Workfile: makefile $ #* #* Ersterstellung JSC 24.06.99 -#* Letzte Aenderung $Author: hr $ $Date: 2000-11-13 16:11:22 $ -#* $Revision: 1.2 $ +#* Letzte Aenderung $Author: hjs $ $Date: 2001-01-16 12:04:17 $ +#* $Revision: 1.3 $ #* #* $Logfile:$ #* @@ -41,6 +41,13 @@ INCPRE+=$(UNOUCROUT) SLOFILES= \ $(SLO)$/dynamicloader.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)$/staticmbdynamic.obj +.ENDIF + SHL1TARGET= $(TARGET) SHL1STDLIBS=\ |