summaryrefslogtreecommitdiff
path: root/goodies
diff options
context:
space:
mode:
authorGene Anaya <ganaya@openoffice.org>2001-01-02 22:22:09 +0000
committerGene Anaya <ganaya@openoffice.org>2001-01-02 22:22:09 +0000
commitd79d0d49eda29bd5e4bb83c8f7fcc441b6fc6798 (patch)
tree2812c83f7155f522a275f4bc463dd13ca42b4196 /goodies
parent963ba1e5c936cfb3b53c7b9e4bac94365e03ccc7 (diff)
Add staticmbicgm to build on MacOS X
Diffstat (limited to 'goodies')
-rw-r--r--goodies/source/filter.vcl/icgm/makefile.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/goodies/source/filter.vcl/icgm/makefile.mk b/goodies/source/filter.vcl/icgm/makefile.mk
index f9e144d20b3a..77165ef7c266 100644
--- a/goodies/source/filter.vcl/icgm/makefile.mk
+++ b/goodies/source/filter.vcl/icgm/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:30:14 $
+# last change: $Author: ganaya $ $Date: 2001-01-02 23:22:09 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -155,6 +155,15 @@ SLOFILES = $(SLO)$/cgm.obj \
$(SLO)$/elements.obj
# $(SLO)$/svdem.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"
+SLOFILES+=$(SLO)$/staticmbicgm.obj
+.ENDIF
+
+
+
SHL1TARGET = icg$(UPD)$(DLLPOSTFIX)
SHL1IMPLIB = icgm
SHL1DEPN = $(LB)$/icgm.lib