diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-02-12 02:52:46 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-02-12 02:52:46 +0000 |
| commit | e21abb879e8afbca323c9a88623074d4a71f27d8 (patch) | |
| tree | dc1dac9ffc82d132c905f9d93beaaa1a784b052c /stoc | |
| parent | 3107cf9c034feb355062c3176e1d1c3ff5edc945 (diff) | |
Updates to compile on Mac OS X and to move duplicate static data members to cppuhelper project for Mac OS X
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/corereflection/makefile.mk | 5 | ||||
| -rw-r--r-- | stoc/source/invocation/makefile.mk | 5 | ||||
| -rw-r--r-- | stoc/source/registry_tdprovider/makefile.mk | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk index 284951988233..694e90cb7dd6 100644 --- a/stoc/source/corereflection/makefile.mk +++ b/stoc/source/corereflection/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:06:29 $ +# last change: $Author: pluby $ $Date: 2001-02-12 03:52:41 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,6 +83,7 @@ SLOFILES= \ $(SLO)$/crcomp.obj \ $(SLO)$/criface.obj \ $(SLO)$/crenum.obj + # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols .IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmbcorereflection.obj diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk index 59bdb577c853..f1882bfdef16 100644 --- a/stoc/source/invocation/makefile.mk +++ b/stoc/source/invocation/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:12:48 $ +# last change: $Author: pluby $ $Date: 2001-02-12 03:52:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,6 +78,7 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/invocation.obj + # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols .IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmbinvocation.obj diff --git a/stoc/source/registry_tdprovider/makefile.mk b/stoc/source/registry_tdprovider/makefile.mk index 901c5d2f344d..21187c13dfad 100644 --- a/stoc/source/registry_tdprovider/makefile.mk +++ b/stoc/source/registry_tdprovider/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:17:57 $ +# last change: $Author: pluby $ $Date: 2001-02-12 03:52:46 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,6 +83,7 @@ SLOFILES= \ $(SLO)$/tdenum.obj \ $(SLO)$/tdcomp.obj \ $(SLO)$/tdiface.obj + # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols .IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmbregistry_tdprovider.obj |