diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:44:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-09-10 22:44:47 +0000 |
| commit | 73f178936ab18e3360f40ccdd046f3c4a1c03f47 (patch) | |
| tree | dfc074d35ff33d507bae3037fc8dddd83ddeb9df /formula | |
| parent | 476965845fb5d6fdd52791b1d4359c7298235252 (diff) | |
CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/util/makefile.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index 6852a53e49..d1d78c11bb 100644 --- a/formula/util/makefile.mk +++ b/formula/util/makefile.mk @@ -98,7 +98,11 @@ SHL2STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) -.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +.IF "$(GUI)"=="OS2" +SHL2STDLIBS+= \ + $(LB)$/ifor.lib +SHL2DEPN=$(LB)$/i$(TARGET).lib +.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" SHL2STDLIBS+= \ -lfor$(DLLPOSTFIX) SHL2DEPN=$(SHL1TARGETN) @@ -113,6 +117,10 @@ SHL2IMPLIB=i$(TARGET2) SHL2LIBS=$(LIB2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) +.IF "$(GUI)"=="OS2" +DEFLIB2NAME=$(TARGET2) +.ENDIF + SHL2USE_EXPORTS=name # SHL2VERSIONMAP=$(TARGET2).map |