diff options
| author | Andras Timar <atimar@suse.com> | 2013-05-21 03:43:52 -0700 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-05-21 12:19:59 +0000 |
| commit | d7b428453b07f48b56e7d83f05d81fae91b921c8 (patch) | |
| tree | b8e757bde8e2ef4b2b0c9241ae40b2a31ac3a67a /external | |
| parent | c905068b9d3b7406d629728e01a5f9460521de8f (diff) | |
make 64-bit shell extensions work, put 64-bit VC runtime in the same dir
Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is installed
to the "system32" folder. Windows installer automatically replaces it to
SysWOW64. The problem is that this way 64-bit dlls end up in the wrong directory.
They conflict with the 32-bit dlls, and will not be installed. Therefore
64-bit shell extensions will not work, unless the 64-bit VC runtime is
installed from other source. It is not possible to install both 32-bit and
64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012.
For the 64-bit shell extensions, we can install the runtime dlls next to the files.
Conflicts:
scp2/source/ooo/vc_redist.scp
Change-Id: I47060f8ff764ca1156596139ecbec003f964bc60
Reviewed-on: https://gerrit.libreoffice.org/3990
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/msvcp100/README_msvcX100.dll | 2 | ||||
| -rw-r--r-- | external/prj/d.lst | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/external/msvcp100/README_msvcX100.dll b/external/msvcp100/README_msvcX100.dll index a1b0e732b2ad..ada64ed74ff1 100644 --- a/external/msvcp100/README_msvcX100.dll +++ b/external/msvcp100/README_msvcX100.dll @@ -1,2 +1,2 @@ -Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a +Put 64-bit msvcp100.dll, msvcr100.dll in this directory for Windows builds using a VS 2010 / VC 10.0 compiler. diff --git a/external/prj/d.lst b/external/prj/d.lst index 7ee2582f0f7b..c357edcf8811 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -36,6 +36,10 @@ mkdir: %_DEST%\inc\external\wine ..\msvcp90\msvcr90*.dll %_DEST%\bin ..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest ..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest +..\msvcp100\msvcp100*.dll %_DEST%\bin +..\msvcp100\msvcr100*.dll %_DEST%\bin +..\msvcp110\msvcp110*.dll %_DEST%\bin +..\msvcp110\msvcr110*.dll %_DEST%\bin ..\msm90\*.msm %_DEST%\bin ..\msm100\*.msm %_DEST%\bin ..\msm110\*.msm %_DEST%\bin |