Fix #874: Also install msvcp140_2.dll in Windows

This follows up to my previous commit [1], which started building Qt6 and mozc_tool.exe as 64-bit binaries for Windows as part of #732. What I overlooked is that Qt6Gui.dll also links to msvcp140_2.dll. As a result, mozc_tool.exe can now run only when Visual C++ runtime library has already been installed, which is not our intention. With this commit msvcp140_2.dll is also installed and mozc_tool.exe should run without manually installing Visual C++ runtime library. [1]: 189147e PiperOrigin-RevId: 605535149
google · Feb 9, 2024 · 9dc8494 · 9dc8494
1 parent bdadb85
commit 9dc8494
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/win32/installer/installer_64bit.wxs b/src/win32/installer/installer_64bit.wxs
@@ -206,6 +206,11 @@
                     DiskId='1' Checksum='yes'
                     Source='$(var.ReleaseRedistCrt64Dir)/msvcp140_1.dll' />
               </Component>
+              <Component Id='msvcp140_2' Guid='*'>
+                <File Id='msvcp140_2.dll' Name='msvcp140_2.dll'
+                    DiskId='1' Checksum='yes'
+                    Source='$(var.ReleaseRedistCrt64Dir)/msvcp140_2.dll' />
+              </Component>
               <Component Id='vcruntime140' Guid='*'>
                 <File Id='vcruntime140.dll' Name='vcruntime140.dll'
                     DiskId='1' Checksum='yes'
@@ -382,6 +387,7 @@
       <?if $(var.VSConfigurationName) = "Release" ?>
         <ComponentRef Id='msvcp140' />
         <ComponentRef Id='msvcp140_1' />
+        <ComponentRef Id='msvcp140_2' />
         <ComponentRef Id='vcruntime140' />
         <ComponentRef Id='vcruntime140_1' />
         <ComponentRef Id='QtCoreDll' />

diff --git a/src/win32/installer/installer_oss_64bit.wxs b/src/win32/installer/installer_oss_64bit.wxs
@@ -179,6 +179,11 @@
                   DiskId='1' Checksum='yes'
                   Source='$(var.ReleaseRedistCrt64Dir)/msvcp140_1.dll' />
             </Component>
+            <Component Id='msvcp140_2' Guid='*'>
+              <File Id='msvcp140_2.dll' Name='msvcp140_2.dll'
+                  DiskId='1' Checksum='yes'
+                  Source='$(var.ReleaseRedistCrt64Dir)/msvcp140_2.dll' />
+            </Component>
             <Component Id='vcruntime140' Guid='*'>
               <File Id='vcruntime140.dll' Name='vcruntime140.dll'
                   DiskId='1' Checksum='yes'
@@ -319,6 +324,7 @@
       <?if $(var.VSConfigurationName) = "Release" ?>
         <ComponentRef Id='msvcp140' />
         <ComponentRef Id='msvcp140_1' />
+        <ComponentRef Id='msvcp140_2' />
         <ComponentRef Id='vcruntime140' />
         <ComponentRef Id='vcruntime140_1' />
         <ComponentRef Id='QtCoreDll' />