diff options
author | sb <sb@openoffice.org> | 2009-09-16 17:08:52 +0200 |
---|---|---|
committer | sb <sb@openoffice.org> | 2009-09-16 17:08:52 +0200 |
commit | 11418032c587bcee688fcb4f76739c0e2520193b (patch) | |
tree | fd69455f64f6f2940f9eab860e45b06e8abaf748 /formula/util/makefile.mk | |
parent | ca107138e1786b636b8f81ebbcc9994ac7dd393f (diff) | |
parent | a11aa70b384e3ca0df953b53cff6b4d7f9699147 (diff) |
merged in DEV300_m59
Diffstat (limited to 'formula/util/makefile.mk')
-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 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 |