wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 681893 - Add the CRT dlls we don't use to the remove-files lists. Also fix inclusion of the MSVC 10 CRT in the js shell archive. r=khuey

Browse Source
This commit is contained in:
Mike Hommey 2011-08-29 07:23:20 +02:00
parent b105110b75
commit 3f485aa66c
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
browser/installer/removed-files.in
View File

@ -1272,6 +1272,22 @@ xpicleanup@BIN_SUFFIX@
components/nsPostUpdateWin.js
js3250.dll
plugins/npnul32.dll
#if _MSC_VER != 1400
@BINPATH@/Microsoft.VC80.CRT.manifest
@BINPATH@/msvcm80.dll
@BINPATH@/msvcp80.dll
@BINPATH@/msvcr80.dll
#endif
#if _MSC_VER != 1500
@BINPATH@/Microsoft.VC90.CRT.manifest
@BINPATH@/msvcm90.dll
@BINPATH@/msvcp90.dll
@BINPATH@/msvcr90.dll
#endif
#if _MSC_VER != 1600
@BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll
#endif
mozcrt19.dll
mozcpp19.dll
#endif

16
mobile/installer/removed-files.in
View File

@ -3,6 +3,22 @@ README.txt
extensions/feedback@mobile.mozilla.org.xpi
#endif
#ifdef XP_WIN
#if _MSC_VER != 1400
@BINPATH@/Microsoft.VC80.CRT.manifest
@BINPATH@/msvcm80.dll
@BINPATH@/msvcp80.dll
@BINPATH@/msvcr80.dll
#endif
#if _MSC_VER != 1500
@BINPATH@/Microsoft.VC90.CRT.manifest
@BINPATH@/msvcm90.dll
@BINPATH@/msvcp90.dll
@BINPATH@/msvcr90.dll
#endif
#if _MSC_VER != 1600
@BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll
#endif
mozcrt19.dll
mozcpp19.dll
#endif

2
toolkit/mozapps/installer/packager.mk
View File

@ -101,7 +101,7 @@ ifeq ($(_MSC_VER),1500)
JSSHELL_BINS += $(DIST)/bin/Microsoft.VC90.CRT.manifest
JSSHELL_BINS += $(DIST)/bin/msvcr90.dll
endif
ifeq ($(_MSC_VER),1500)
ifeq ($(_MSC_VER),1600)
JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
endif
else