summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-09-10 22:44:47 +0000
committerKurt Zenker <kz@openoffice.org>2009-09-10 22:44:47 +0000
commitf0ed8716b3b2556cb86e8005be88922c594c1189 (patch)
tree487bfcce6d8b684a059d8b15078d4c2b62ae203a /formula
parent270e03fea6602d0b4d4b0e63c9711fed00d6646b (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.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index 6852a53e499d..d1d78c11bbc2 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