Kaydet (Commit) bf756043 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS mingwport13 (1.5.10); FILE MERGED

2008/06/03 13:30:51 vg 1.5.10.1: #i90179# MinGW catch-up fixes for m14
üst d75f3e6f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.5 $ # $Revision: 1.6 $
# #
# This file is part of OpenOffice.org. # This file is part of OpenOffice.org.
# #
...@@ -278,6 +278,9 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) ...@@ -278,6 +278,9 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
@-$(MKDIRHIER) $(@:d) @-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@ +$(COPY) $< $@
.IF "$(OS)$(CPU)"=="WNTI" .IF "$(OS)$(CPU)"=="WNTI"
.IF "$(COM)"=="GCC"
$(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
.ELSE
.IF "$(PACKMS)"!="" .IF "$(PACKMS)"!=""
.IF "$(CCNUMVER)" <= "001499999999" .IF "$(CCNUMVER)" <= "001499999999"
$(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR) $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR)
...@@ -303,6 +306,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) ...@@ -303,6 +306,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
$(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR) $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
.ENDIF .ENDIF
.ENDIF # "$(PACKMS)"!="" .ENDIF # "$(PACKMS)"!=""
.ENDIF #"$(COM)"=="GCC"
.ENDIF .ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment