diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:25:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:25:03 +0000 |
| commit | 3451cfb0218caec39602224b9e87918429cb04bd (patch) | |
| tree | 82b7e8a5ac615c1f2984ea257e18b7f86671f142 /sal/util | |
| parent | INTEGRATION: CWS os2port01 (1.25.36); FILE MERGED (diff) | |
| download | core-3451cfb0218caec39602224b9e87918429cb04bd.tar.gz core-3451cfb0218caec39602224b9e87918429cb04bd.zip | |
INTEGRATION: CWS os2port01 (1.39.96); FILE MERGED
2007/09/05 08:39:45 obr 1.39.96.3: RESYNC: (1.42-1.43); FILE MERGED
2007/08/09 09:31:17 obr 1.39.96.2: RESYNC: (1.39-1.42); FILE MERGED
2006/11/29 14:26:54 ydario 1.39.96.1: Initial OS/2 import.
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 49f026804508..fcda30b5bcc8 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.43 $ +# $Revision: 1.44 $ # -# last change: $Author: ihi $ $Date: 2007-08-20 13:36:35 $ +# last change: $Author: vg $ $Date: 2007-09-20 15:25:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -93,7 +93,7 @@ LIB3FILES= \ #LIB3FILES+=$(LB)$/systoolsunx.lib #.ENDIF # UNX -.IF "$(GUI)" == "WNT" +.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2" SHL1TARGET= $(TARGET) .ELSE SHL1TARGET= uno_$(TARGET) @@ -136,6 +136,10 @@ SHL1STDLIBS= -lexc .ENDIF .ENDIF # UNX +.IF "$(GUI)"=="OS2" +SHL1STDLIBS=pthread.lib lvm.lib +.ENDIF # OS2 + # If we compile sal with STLport checking iterators # we need to link against the STLport .IF "$(USE_STLP_DEBUG)" != "" |