diff options
| author | Patrick Luby <patrick.luby@openoffice.org> | 2000-09-28 03:20:24 +0000 |
|---|---|---|
| committer | Patrick Luby <patrick.luby@openoffice.org> | 2000-09-28 03:20:24 +0000 |
| commit | 52efb21b60f8b405804cb9290b62f01aef495402 (patch) | |
| tree | 0bcdc687ea311ed3259859004f36b60859f85d84 /extensions/source/resource/makefile.mk | |
| parent | 15a4f7932d58854da6151f6389cea9593a2d22f6 (diff) | |
Added initialization of static data members for template classes for Mac OS X
Diffstat (limited to 'extensions/source/resource/makefile.mk')
| -rw-r--r-- | extensions/source/resource/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk index 5d38e76d5757..fdc99ea6900f 100644 --- a/extensions/source/resource/makefile.mk +++ b/extensions/source/resource/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:16:52 $ +# last change: $Author: patrick.luby $ $Date: 2000-09-28 04:20:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,6 +80,13 @@ SLOFILES= $(SLO)$/resource.obj EXCEPTIONSFILES= $(SLO)$/resource.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 m ultiple defined symbols +.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +EXCEPTIONSFILES+=$(SLO)$/staticmbresource.obj +.ENDIF + LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1OBJFILES= $(EXCEPTIONSFILES) |