diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 15:55:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 15:55:56 +0000 |
| commit | acae3372e1f577cb92b3209684c4d255b56ca1c7 (patch) | |
| tree | 5b36027171faf2f91dcb98b700246dc1ca1e9d58 /solenv/inc/tg_shl.mk | |
| parent | ddd0b278fd80e3943e629bb3ac26ef03d85dcc30 (diff) | |
INTEGRATION: CWS mingwport13 (1.123.32); FILE MERGED
2008/05/05 11:35:16 vg 1.123.32.1: #i88772# MinGW fixes for DEV300
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 95e2c6170c5d..83a5fc436b81 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -8,7 +8,7 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.124 $ +# $Revision: 1.125 $ # # This file is part of OpenOffice.org. # @@ -245,6 +245,7 @@ $(SHL$(TNR)TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL$(TNR)USE_EXPORTS)"=="name" .IF "$(GUI)"=="WNT" +.IF "$(COM)"!="GCC" .IF "$(SHL$(TNR)LIBS)"!="" SHL$(TNR)LINKLIST=$(MISC)$/$(SHL$(TNR)TARGET)_link.lst SHL$(TNR)LINKLISTPARAM=@$(SHL$(TNR)LINKLIST) @@ -252,6 +253,7 @@ $(SHL$(TNR)LINKLIST) : $(SHL$(TNR)LIBS) @@-$(RM) $@ $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL$(TNR)LIBS)"!="" +.ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="name" |