strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't bundle MSVC runtime + don't dupplicate licenses

Browse source
This commit is contained in:
Fridrich Štrba 2010-12-13 21:19:49 +01:00
parent e4bb71d17e
commit 1be9e3a375
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sdext/source/presenter/makefile.mk
View file

@ -313,7 +313,7 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@
.IF "$(OS)$(CPU)"=="WNTI"
.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
.IF "$(COM)"=="GCC"
$(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
.ELSE
@ -353,7 +353,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
.ENDIF
.ENDIF # "$(PACKMS)"!=""
.ENDIF #"$(COM)"=="GCC"
.ENDIF
.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
@ -365,19 +365,14 @@ $(ZIP1DIR)$/%.xcs : %.xcs
@@-$(MKDIRHIER) $(@:d)
$(GNUCOPY) $< $@
# Temporary file that is used to replace some placeholders in description.xml.
DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp
.INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk
.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
PHONYDESC=.PHONY
.ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
$(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
@@-$(RM) $(DESCRIPTION_TMP)
$(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"