Changeset 42221 in vbox

Timestamp:

Jul 19, 2012 1:36:09 AM (12 years ago)

Author:

vboxsync

Message:

Install VC2010 runtime to the staging area.

File:

• trunk/Makefile.kmk (modified) (2 diffs)

trunk/Makefile.kmk

@@ -95 +95 @@
 # The compiler runtime DLLs.
 ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
+ ifdef VBOX_USE_VCC100
+   VBOX_PATH_VCC_REDIST         = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/
+   VBOX_PATH_VCC_REDIST_CRT     = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT
+   VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT
+   bin_SOURCES += \
+        $(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll \
+        $(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll \
+        $(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll=>testcase/msvcr100.dll \
+        $(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll=>testcase/msvcp100.dll
+  ifeq ($(VBOX_VCC_CRT_TYPE),d)
+        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll \
+        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll \
+        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll=>testcase/msvcr100.dll \
+        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll=>testcase/msvcp100.dll
+  endif
+ endif
  ifdef VBOX_USE_VCC80
   include $(KBUILD_PATH)/tools/VCC80X86.kmk
@@ -129 +145 @@
   endif
  endif
- ifndef VBOX_USE_VCC80
-  VBOX_INSTALL_VCC70_RT = 1
- endif
- ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
-  VBOX_INSTALL_VCC70_RT = 1
+ ifndef VBOX_USE_VCC100
+  ifndef VBOX_USE_VCC80
+   VBOX_INSTALL_VCC70_RT = 1
+  endif
+  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
+   VBOX_INSTALL_VCC70_RT = 1
+  endif
  endif
  ifdef VBOX_INSTALL_VCC70_RT