diff options
| author | Yuri Dario <ydario@apache.org> | 2012-02-18 18:28:22 +0000 |
|---|---|---|
| committer | Yuri Dario <ydario@apache.org> | 2012-02-18 18:28:22 +0000 |
| commit | ee9bc4299ca0899b7f0e9a65fd73689fe18fa16d (patch) | |
| tree | b5edf00d5531abffd3877fda72ba05cbc4f530bd /reportdesign | |
| parent | 02e75d8f74aba5e174c3ad0840443c8de146936a (diff) | |
i118923 - OS/2 port: new link system now uses unix style.
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/util/makefile.mk | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk index fa973ae01d01..6c1025478a55 100644 --- a/reportdesign/util/makefile.mk +++ b/reportdesign/util/makefile.mk @@ -67,10 +67,7 @@ SHL1STDLIBS= \ $(VOSLIB) \ $(SALLIB) -.IF "$(GUI)"=="OS2" -SHL1STDLIBS+= \ - idbu.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2" SHL1STDLIBS+= \ -ldbu$(DLLPOSTFIX) .ELSE @@ -127,11 +124,7 @@ SHL2STDLIBS= \ $(SO2LIB) \ $(I18NISOLANGLIB) \ $(SALLIB) -.IF "$(GUI)"=="OS2" -SHL2STDLIBS+= \ - idbu.lib \ - i$(TARGET).lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2" SHL2STDLIBS+= \ -ldbu$(DLLPOSTFIX) \ -l$(TARGET)$(DLLPOSTFIX) @@ -141,11 +134,7 @@ SHL2STDLIBS+= \ i$(TARGET).lib .ENDIF -.IF "$(GUI)"=="OS2" -SHL2STDLIBS+= \ - ifor.lib \ - iforui.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2" SHL2STDLIBS+= \ -lfor$(DLLPOSTFIX) \ -lforui$(DLLPOSTFIX) @@ -200,10 +189,7 @@ SHL3STDLIBS=\ $(SOTLIB) \ $(SO2LIB) \ $(SALLIB) -.IF "$(GUI)"=="OS2" -SHL3STDLIBS+= \ - irpt.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2" SHL3STDLIBS+= \ -l$(TARGET)$(DLLPOSTFIX) .ELSE |