Changeset 49537 in vbox for trunk/src/VBox/Installer

Timestamp:

Nov 18, 2013 4:19:01 PM (11 years ago)

Author:

vboxsync

Message:

Main/VBoxClient-x86: attempt to fix packaging, needs VBoxRT-x86.dll, and has to move to a separate directory to allow having 32 bit msvc*.dll in the same directory

File:

• trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (2 diffs)

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -337 +337 @@
 
 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
-                    <!-- The 32-bit client COM component (see also cp_MainCom below). -->
-                    <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
-                        <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
-                            Source="$(env.PATH_OUT)\bin\VBoxClient-x86.dll" KeyPath="yes">
-                        </File>
-                        <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
-                    </Component>
+                    <Directory Id="dir_X86" Name="x86">
+                        <!-- The 32-bit client COM component (see also cp_MainCom below). -->
+                        <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
+                            <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
+                                Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes">
+                            </File>
+                            <File Id="VBoxRT_x86" Name="VBoxRT-x86.dll"
+                                Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll">
+                            </File>
+                            <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
+<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
+                            <!-- MS C/C++ v10.0 32 bit Runtime DLL files. -->
+                            <File Id="file_msvcr100.dll_x86" Name="msvcr100.dll"
+                                  Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll" />
+                            <File Id="file_msvcp100.dll_x86" Name="msvcp100.dll"
+                                  Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll" />
+<?endif?>
+<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
+                            <!-- MS C/C++ v11.0 Runtime DLL files. -->
+                            <File Id="file_msvcr110.dll_x86" Name="msvcr110.dll"
+                                  Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll" />
+                            <File Id="file_msvcp110.dll_x86" Name="msvcp110.dll"
+                                  Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll" />
+<?endif?>
+                        </Component>
+                    </Directory>
 <?endif?>
 
@@ -449 +468 @@
                         <File Id="file_VBoxNetDHCP.exe" Name="VBoxNetDHCP.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxNetDHCP.exe"/>
-                        <File Id="file_VBoxNetNAT.exe" Name="VBoxNetNAT.exe"
+                        <File Id="file_VBoxNetNAT.exe" Name="VBoxNetNAT.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxNetNAT.exe"/>
 <?if $(env.VBOX_WITH_EXTPACK) = "yes" ?>