#i120979# - Bundle msvcr100.dll to support Java 7

4 files changed, 29 insertions, 0 deletions

diff --git a/configure.in b/configure.in
index e7ef1d3b6699..9a16dfba81ad 100644
--- a/configure.in
+++ b/configure.in
@@ -6106,6 +6106,22 @@ You may have to search Microsoft's website. Last time it was seen at:
 fi
 
 dnl ===================================================================
+dnl Windows builds need msvcr100.dll in external/msvcp100/
+dnl ===================================================================
+if test "$_os" = "WINNT"; then
+   AC_MSG_CHECKING([for msvcr100.dll])
+   if test -x ./external/msvcp100/msvcr100.dll; then
+      AC_MSG_RESULT([found and executable])
+   else
+      AC_MSG_ERROR([msvcr100.dll is missing in external/msvcp100/.
+Get it from the Microsoft Visual C++ 2010 Redistributable Package (x86),
+from the Microsoft site and put it into external/msvcp100.
+You may have to search Microsoft's website. Last time it was seen at:
+<http://www.microsoft.com/en-us/download/search.aspx?q=Microsoft+Visual+C%2b%2b+2010+Redistributable>.])
+   fi
+fi
+
+dnl ===================================================================
 dnl Test which vclplugs have to be built.
 dnl ===================================================================
 AC_MSG_CHECKING([which VCLplugs shall be built])
diff --git a/external/msvcp100/README_msvcX100.dll.txt b/external/msvcp100/README_msvcX100.dll.txt
new file mode 100755
index 000000000000..54f80d136b55
--- /dev/null
+++ b/external/msvcp100/README_msvcX100.dll.txt
@@ -0,0 +1,2 @@
+Put msvcr100.dll  in this directory.
+Needed to support Java 7 built with VS2010.
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 18f668faad75..8e277fa52358 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -36,6 +36,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
 ..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest
 ..\msm90\*.msm %_DEST%\bin%_EXT%
 
+..\msvcp100\msvcr100*.dll %_DEST%\bin%_EXT%
+
 ..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
 
 ..\vcredist\vcredist_x86.exe %_DEST%\bin%_EXT%\vcredist_x86.exe
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 759490d77f72..66bcaced99df 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1821,6 +1821,15 @@ File gid_File_Moz_Msvcr80
 End
 #endif
 
+#if defined(WNT)
+File gid_File_Lib_Msvcr100
+    TXT_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = SCP2_URE_DL_NORMAL("msvcr100");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+End
+#endif
+
 #ifndef SYSTEM_REDLAND
 File gid_File_Lib_Raptor
     TXT_FILE_BODY;