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

Back out Bug 735810. r=me

Browse Source 
--HG--
extra : rebase_source : bba79667be0102bbda1eb68f9a2199f201557f6e
This commit is contained in:
Kyle Huey 2012-03-20 09:08:00 -07:00
parent e5fe0f2c05
commit f09ad303be
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/installer/Makefile.in
View File

@ -91,10 +91,6 @@ DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
endif
ifdef WIN32_REDIST_DIR
DEFINES += -DMOZ_WIN32_REDIST=1
endif
include $(topsrcdir)/ipc/app/defs.mk
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)

2
browser/installer/package-manifest.in
View File

@ -69,7 +69,6 @@
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
#endif
#ifdef XP_WIN32
#ifdef MOZ_WIN32_REDIST
#ifndef MOZ_DEBUG
#if _MSC_VER == 1400
@BINPATH@/Microsoft.VC80.CRT.manifest
@ -90,7 +89,6 @@
#endif
#endif
#endif
#endif
[browser]
; [Base Browser Files]

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

@ -1352,35 +1352,29 @@ xpicleanup@BIN_SUFFIX@
components/jsd3250.dll
components/nsPostUpdateWin.js
js3250.dll
mozcpp19.dll
mozcrt19.dll
#ifndef MOZ_WIN32_REDIST
#define _MSC_VER_REDIST 0000
#else
#define _MSC_VER_REDIST _MSC_VER
#endif
#if _MSC_VER_REDIST != 1400
plugins/npnul32.dll
#if _MSC_VER != 1400
Microsoft.VC80.CRT.manifest
msvcm80.dll
msvcp80.dll
msvcr80.dll
#endif
#if _MSC_VER_REDIST != 1500
#if _MSC_VER != 1500
Microsoft.VC90.CRT.manifest
msvcm90.dll
msvcp90.dll
msvcr90.dll
#endif
#if _MSC_VER_REDIST != 1600
#if _MSC_VER != 1600
msvcp100.dll
msvcr100.dll
#endif
#if _MSC_VER_REDIST != 1700
#if _MSC_VER != 1700
msvcp110.dll
msvcr110.dll
#endif
#undef _MSC_VER_REDIST
plugins/npnul32.dll
mozcrt19.dll
mozcpp19.dll
#endif
@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
components/@DLL_PREFIX@jar50@DLL_SUFFIX@