VBoxMergeCOM32On64.wxi

Timestamp:

May 22, 2020 11:16:12 AM (5 years ago)

Author:

vboxsync

Message:

Removed some obsolete VBoxREM*.so references. bugref:9576

File:

trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi

-              r82970
+              r84448
             </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_x86" Name="msvcr100.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll"
+                  DiskId="$(var.Property_DiskIdCommon)" />
+            <File Id="file_msvcp100_x86" Name="msvcp100.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll"
+                  DiskId="$(var.Property_DiskIdCommon)" />
+    <?endif?>
+    <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
+            <!-- MS C/C++ v11.0 Runtime DLL files -->
+            <File Id="file_msvcr110_x86" Name="msvcr110.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll"
+                  DiskId="$(var.Property_DiskIdCommon)" />
+            <File Id="file_msvcp110_x86" Name="msvcp110.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll"
+                  DiskId="$(var.Property_DiskIdCommon)" />
+    <?endif?>
+            <!-- Include CRT Dlls (specific to the compiler). -->
+            <?include $(env.PATH_TARGET)\VBoxCrtDlls32.wxi ?>
         </Component>
     </Directory>

Note: See TracChangeset for help on using the changeset viewer.