diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:30:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:30:45 +0000 |
| commit | 7cebb2af2003b78af1c0e5e02e4913f963b1c5c0 (patch) | |
| tree | 07ed9afbd50bdd2ad056165224cfb450677beaf9 /salhelper | |
| parent | 43002abc7840b9ae3b68e8000762676d78c0ee28 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.16.4); FILE MERGED
2003/07/14 14:24:43 fa 1.16.4.1: Conditionalize OS X + gcc 2.95 hacks for only gcc 2.95.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16630
Dan
fa@ooo
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/source/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index ddb82329cde2..2c25fef99c52 100644 --- a/salhelper/source/makefile.mk +++ b/salhelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: vg $ $Date: 2003-06-12 09:58:28 $ +# last change: $Author: hr $ $Date: 2003-07-16 17:30:45 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,7 +87,7 @@ SLOFILES= \ $(SLO)$/simplereferenceobject.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" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)$(CVER)"=="MACOSXC295" SLOFILES+=$(SLO)$/staticmb.obj .ENDIF |