From d5b2ac3f5d55c6e2e6cb66c2c5730c4e78d4dd8a Mon Sep 17 00:00:00 2001
From: Roy Tam <roytam@gmail.com>
Date: Fri, 20 Jul 2018 21:47:05 +0800
Subject: [PATCH] Makefiles: copy VS2013 runtime DLLs

---
 b2g/installer/package-manifest.in     | 3 +++
 browser/installer/package-manifest.in | 4 ++++
 browser/installer/removed-files.in    | 5 +++++
 toolkit/mozapps/installer/packager.mk | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 011bd0a3d..a84a13f8b 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -86,6 +86,9 @@
 #elif MOZ_MSVC_REDIST == 1700
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
+#elif MOZ_MSVC_REDIST == 1800
+@BINPATH@/msvcp120.dll
+@BINPATH@/msvcr120.dll
 #endif
 #endif
 #endif
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index ed30c48d2..2d51ed3ed 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -100,6 +100,10 @@
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
 @BINPATH@/vcomp110.dll
+#elif MOZ_MSVC_REDIST == 1800
+@BINPATH@/msvcp120.dll
+@BINPATH@/msvcr120.dll
+@BINPATH@/vcomp120.dll
 #endif
 #endif
 #endif
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 0ff8b81b3..603075dba 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -701,6 +701,11 @@ xpicleanup@BIN_SUFFIX@
     msvcr110.dll
     vcomp110.dll
   #endif
+  #if MOZ_MSVC_REDIST != 1800
+    msvcp120.dll
+    msvcr120.dll
+    vcomp120.dll
+  #endif
   plugins/npnul32.dll
 #endif
 @DLL_PREFIX@xpcom_core@DLL_SUFFIX@
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index ef32a857c..eb1e3aec2 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -84,6 +84,9 @@ endif
 ifeq ($(_MSC_VER),1700)
 JSSHELL_BINS += $(DIST)/bin/msvcr110.dll
 endif
+ifeq ($(_MSC_VER),1800)
+JSSHELL_BINS += $(DIST)/bin/msvcr120.dll
+endif
 ifdef MOZ_FOLD_LIBS
 JSSHELL_BINS += $(DIST)/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX)
 else