summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-05-28 08:38:48 -0700
committerAndras Timar <atimar@suse.com>2013-05-28 08:40:51 -0700
commit5c0a2940428c5c4b8451ee4e9ce30f0b7739f3c8 (patch)
treea21119ca96b87741d49a533fa4d94276b970b5b5 /scp2
parentb55ad00ec1d672808a0eaa92738d05ffbdaf21c9 (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. Change-Id: I157048a521662bbac568d1660e46576935f0ea9f
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/vc_redist.scp22
-rw-r--r--scp2/source/winexplorerext/file_winexplorerext.scp44
-rw-r--r--scp2/source/winexplorerext/module_winexplorerext.scp6
3 files changed, 49 insertions, 23 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 283ba9c6c0d1..82cd0d08d9b1 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -87,26 +87,4 @@ End
#endif
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
- Feature = gm_Root;
- Name = "Microsoft_VC100_CRT_x64.msm";
- RootDir = "TARGETDIR";
- ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
- Feature = gm_Root;
- Name = "Microsoft_VC110_CRT_x64.msm";
- RootDir = "TARGETDIR";
- ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
-End
-
-#endif
-
#endif
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index f2a2a89e8ec6..ce8dc1c586ab 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -95,3 +95,47 @@ File gid_File_Lib_Shlxtmsi
Dir = SCP2_OOO_BIN_DIR;
Name = "shlxtmsi.dll";
End
+
+#ifdef BUILD_X64
+
+#if defined(WITH_VC100_REDIST)
+
+File gid_File_Lib_Msvcr100
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "msvcr100.dll";
+ ComponentCondition = "VersionNT64";
+End
+
+File gid_File_Lib_Msvcp100
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "msvcp100.dll";
+ ComponentCondition = "VersionNT64";
+End
+
+#endif
+
+#if defined(WITH_VC110_REDIST)
+
+File gid_File_Lib_Msvcr110
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "msvcr110.dll";
+ ComponentCondition = "VersionNT64";
+End
+
+File gid_File_Lib_Msvcp110
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Shlxthdl;
+ Name = "msvcp110.dll";
+ ComponentCondition = "VersionNT64";
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 3932e4f4d7c9..6756a305829a 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -51,5 +51,9 @@ Module gid_Module_Optional_Winexplorerext_x64
Dirs = (gid_Dir_Shlxthdl);
Files = (gid_File_Lib_Shlxthdl64,
gid_File_Lib_OOoFilt64,
- gid_File_Lib_PropertyHdl64);
+ gid_File_Lib_PropertyHdl64,
+ gid_File_Lib_Msvcp100,
+ gid_File_Lib_Msvcr100,
+ gid_File_Lib_Msvcp110,
+ gid_File_Lib_Msvcr110);
End