diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-13 21:19:49 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-13 21:20:25 +0100 |
| commit | 1be9e3a37562072b4c7512e2474a0cbb60b57410 (patch) | |
| tree | 51d63dcbd587a97f4e5ada76e34f587741829d18 /sdext | |
| parent | e4bb71d17e8ca177a1eb7d9f68f13ddd1a1ee1a5 (diff) | |
Don't bundle MSVC runtime + don't dupplicate licenses
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/presenter/makefile.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index bb8a9740958e..f20fa5b15c50 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -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" |