diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2001-02-22 02:49:10 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2001-02-22 02:49:10 +0000 |
| commit | 3363c28ab0c57f3416c3d6e80006ae07c53ecbd4 (patch) | |
| tree | 5caab151eb6b497fd9eb7585a65ebb0cb6d59e92 /sfx2/source/appl/makefile.mk | |
| parent | be442862608fdff54bd1b5e3d2568f1498ebc424 (diff) | |
Add staticmbappl.cxx file for static symbols needed in Mac OS X build.
Diffstat (limited to 'sfx2/source/appl/makefile.mk')
| -rw-r--r-- | sfx2/source/appl/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index 5ae622561842..ad72a71fd4b3 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2001-02-08 15:12:41 $ +# last change: $Author: ganaya $ $Date: 2001-02-22 03:49:10 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -131,6 +131,11 @@ SLOFILES = \ $(SLO)$/newhelp.obj \ $(SLO)$/helpinterceptor.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)$/staticmbappl.obj +.ENDIF + EXCEPTIONSFILES=\ $(SLO)$/appmain.obj \ $(SLO)$/appmisc.obj \ @@ -141,7 +146,7 @@ EXCEPTIONSFILES=\ $(SLO)$/rmacceptor.obj \ $(SLO)$/appcfg.obj \ $(SLO)$/helpinterceptor.obj \ - $(SLO)$/newhelp.obj + $(SLO)$/newhelp.obj \ .IF "$(GUI)" == "MAC" SLOFILES +=\ |