User: kz Date: 2007-09-06 13:38:53+0000 Modified: dba/reportdesign/util/makefile.mk
Log: INTEGRATION: CWS mingwport06 (1.4.2); FILE MERGED 2007/08/28 14:22:10 vg 1.4.2.1: #i80359# MinGW port efforts File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.6&r2=1.7 Delta lines: +11 -11 --------------------- --- makefile.mk 2007-08-31 09:17:57+0000 1.6 +++ makefile.mk 2007-09-06 13:38:50+0000 1.7 @@ -75,12 +75,12 @@ $(TKLIB) \ $(VOSLIB) \ $(SALLIB) -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" SHL1STDLIBS+= \ - idbu.lib + -ldbu$(UPD)$(DLLPOSTFIX) .ELSE SHL1STDLIBS+= \ - -ldbu$(UPD)$(DLLPOSTFIX) + idbu.lib .ENDIF SHL1IMPLIB=i$(TARGET) @@ -129,14 +129,14 @@ $(SO2LIB) \ $(I18NISOLANGLIB) \ $(SALLIB) -.IF "$(GUI)"=="WNT" -SHL2STDLIBS+= \ - idbu.lib \ - i$(TARGET).lib -.ELSE +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" SHL2STDLIBS+= \ -ldbu$(UPD)$(DLLPOSTFIX) \ -l$(TARGET)$(UPD)$(DLLPOSTFIX) +.ELSE +SHL2STDLIBS+= \ + idbu.lib \ + i$(TARGET).lib .ENDIF SHL2DEPN=$(SHL1TARGETN) @@ -183,12 +183,12 @@ $(SOTLIB) \ $(SO2LIB) \ $(SALLIB) -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" SHL3STDLIBS+= \ - irpt.lib + -l$(TARGET)$(UPD)$(DLLPOSTFIX) .ELSE SHL3STDLIBS+= \ - -l$(TARGET)$(UPD)$(DLLPOSTFIX) + irpt.lib .ENDIF --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
