diff options
| -rw-r--r-- | browser/installer/Makefile.in | 1 | ||||
| -rw-r--r-- | browser/installer/package-manifest.in | 2 | ||||
| -rw-r--r-- | build/win32/Makefile.in | 5 | ||||
| -rw-r--r-- | configure.in | 10 |
4 files changed, 15 insertions, 3 deletions
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 385da97ca..03a811c94 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -73,6 +73,7 @@ ifdef MOZ_NO_DEBUG_RTL DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL) DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL) +DEFINES += -DMSVC_OPENMP_DLL=$(MSVC_OPENMP_DLL) ifdef MSVC_APPCRT_DLL DEFINES += -DMSVC_APPCRT_DLL=$(MSVC_APPCRT_DLL) endif diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index f4346b5ad..d113e4b58 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -100,7 +100,7 @@ #ifdef MOZ_PACKAGE_MSVC_DLLS @BINPATH@/@MSVC_C_RUNTIME_DLL@ @BINPATH@/@MSVC_CXX_RUNTIME_DLL@ -@BINPATH@/vcomp120.dll +@BINPATH@/@MSVC_OPENMP_DLL@ #ifdef MSVC_APPCRT_DLL @BINPATH@/@MSVC_APPCRT_DLL@ #endif diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index 3e61d725c..b80dd8611 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -7,8 +7,9 @@ include $(topsrcdir)/config/rules.mk ifdef WIN32_REDIST_DIR REDIST_FILES = \ - $(MSVC_C_RUNTIME_DLL) \ - $(MSVC_CXX_RUNTIME_DLL) \ + $(MSVC_REDIST_CRT_DIR)/$(MSVC_C_RUNTIME_DLL) \ + $(MSVC_REDIST_CRT_DIR)/$(MSVC_CXX_RUNTIME_DLL) \ + $(MSVC_REDIST_OPENMP_DIR)/$(MSVC_OPENMP_DLL) \ $(MSVC_APPCRT_DLL) \ $(MSVC_DESKTOPCRT_DLL) \ $(NULL) diff --git a/configure.in b/configure.in index 269b975c8..ec8256636 100644 --- a/configure.in +++ b/configure.in @@ -501,8 +501,11 @@ case "$target" in if test "$_CC_MAJOR_VERSION" = "18" -a "$_CC_BUILD_VERSION" -ge "30723"; then _CC_SUITE=12 MSVS_VERSION=2013 + MSVC_REDIST_CRT_DIR=Microsoft.VC120.CRT MSVC_C_RUNTIME_DLL=msvcr120.dll MSVC_CXX_RUNTIME_DLL=msvcp120.dll + MSVC_REDIST_OPENMP_DIR=Microsoft.VC120.OPENMP + MSVC_OPENMP_DLL=vcomp120.dll elif test "$_CC_MAJOR_VERSION" = "19"; then _CC_SUITE=14 MSVS_VERSION=2015 @@ -527,8 +530,11 @@ You must install Visual C++ 2013 Update 3 or newer in order to build. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) fi AC_SUBST(MSVS_VERSION) + AC_SUBST(MSVC_REDIST_CRT_DIR) AC_SUBST(MSVC_C_RUNTIME_DLL) AC_SUBST(MSVC_CXX_RUNTIME_DLL) + AC_SUBST(MSVC_REDIST_OPENMP_DIR) + AC_SUBST(MSVC_OPENMP_DLL) AC_SUBST(MSVC_APPCRT_DLL) AC_SUBST(MSVC_DESKTOPCRT_DLL) @@ -545,6 +551,10 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) if test ! -d "$WIN32_REDIST_DIR"; then AC_MSG_ERROR([Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}]) fi + + if test -f "$WIN32_REDIST_DIR/$MSVC_C_RUNTIME_DLL"; then + AC_MSG_ERROR([The Win32 Redist directory must be set to the directory above Microsoft.VCXX0.CRT]) + fi WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd` fi |