diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:32:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:32:42 +0000 |
| commit | 2855c95811b0b43d927cccdf580f01ef55d435ee (patch) | |
| tree | 2df5016aa320d04a7e375048c7a0cb2da6053dfb /cppu/util | |
| parent | 04b966247d3e2bcdb6bf3d3ff4927e4f8da9909a (diff) | |
INTEGRATION: CWS os2port03 (1.3.10); FILE MERGED
2008/07/16 13:41:32 obr 1.3.10.2: RESYNC: (1.3-1.4); FILE MERGED
2008/01/14 16:21:42 ydario 1.3.10.1: os2 requires exports
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'cppu/util')
| -rw-r--r-- | cppu/util/extra.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk index 0aa71da4f0ad..cc18523b92b9 100644 --- a/cppu/util/extra.mk +++ b/cppu/util/extra.mk @@ -8,7 +8,7 @@ # # $RCSfile: extra.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # # This file is part of OpenOffice.org. # @@ -47,14 +47,28 @@ USE_DEFFILE :=TRUE SHL3TARGET := unsafe_uno_uno SHL3IMPLIB := i$(SHL3TARGET) SHL3STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL3OBJS := $(SLO)$/UnsafeBridge.obj +.IF "$(GUI)"=="OS2" +SHL3VERSIONMAP=unsafe_os2.map +SHL3DEF=$(MISC)$/$(SHL3TARGET).def +DEF3NAME=$(SHL3TARGET) +.ELSE SHL3DEF := empty.def +.ENDIF SHL3OBJS := $(SLO)$/UnsafeBridge.obj SHL3RPATH := URELIB SHL4TARGET := affine_uno_uno SHL4IMPLIB := i$(SHL4TARGET) SHL4STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL4OBJS := $(SLO)$/AffineBridge.obj +.IF "$(GUI)"=="OS2" +SHL4VERSIONMAP=unsafe_os2.map +SHL4DEF=$(MISC)$/$(SHL4TARGET).def +DEF4NAME=$(SHL4TARGET) +.ELSE SHL4DEF := empty.def +.ENDIF SHL4OBJS := $(SLO)$/AffineBridge.obj SHL4RPATH := URELIB |