Changeset 46474 in vbox for trunk/Config.kmk

Timestamp:

Jun 10, 2013 4:02:12 PM (11 years ago)

Author:

vboxsync

Message:

VBoxDef2LazyLoad: Added tool for generating lazy loading of VBoxVMM.dll to prevent it being loaded into VBoxSVC and the VM selector.

File:

• trunk/Config.kmk (modified) (6 diffs)

trunk/Config.kmk

@@ -1637 +1637 @@
  LIB_DDU         = $(PATH_STAGE_LIB)/VBoxDDU.lib
 endif
+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.amd64)
+ VBOX_LIB_VMM_LAZY      = $(PATH_STAGE_LIB)/VMMR3LazyImp$(VBOX_SUFF_LIB)
+else
+ VBOX_LIB_VMM_LAZY      = $(LIB_VMM)
+endif
 VBOX_LIB_SUPHARDENED    = $(PATH_STAGE_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB)
 VBOX_LIB_RUNTIME_STATIC = $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
@@ -1730 +1735 @@
 # MakeAlternativeSource (for BIOSes)
 VBOX_MAKE_ALTERNATIVE_SOURCE ?= $(PATH_OBJ)/MakeAlternativeSource/MakeAlternativeSource$(HOSTSUFF_EXE)
+
+# VBoxDef2LazyLoad (lazy dynamic library loader assembly generator)
+VBOX_DEF_2_LAZY_LOAD ?= $(PATH_OBJ)/VBoxDef2LazyLoad/VBoxDef2LazyLoad$(HOSTSUFF_EXE)
 
 # GNU tar if present.
@@ -4125 +4133 @@
  endif
  ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
-  if1of ($(KBUILD_TARGET), win os2)
+  if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.amd64)
+   TEMPLATE_VBoxR3ExtPack_LIBS = \
+        $(TEMPLATE_LIBS_VBOXR3) \
+        $(VBOX_LIB_VMM_LAZY) \
+        $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
+  else if1of ($(KBUILD_TARGET), win os2)
    TEMPLATE_VBoxR3ExtPack_LIBS = \
         $(TEMPLATE_LIBS_VBOXR3) \
@@ -4140 +4153 @@
         $(TEMPLATE_LIBS_VBOXR3) \
         $(LIB_RUNTIME) \
-        $(LIB_VMM)
+        $(VBOX_LIB_VMM_LAZY)
  endif
 
@@ -4288 +4301 @@
         $(VBOX_LIBS_QT4) \
         $(LIB_RUNTIME) \
+        $(VBOX_LIB_VMM_LAZY) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt.lib \
@@ -4332 +4346 @@
         $(LIB_SDL) \
         $(LIB_RUNTIME) \
-        $(LIB_REM) \
-        $(LIB_VMM)
+        $(if-expr "$(LIB_VMM)" == "$(VBOX_LIB_VMM_LAZY)",$(LIB_REM),) \
+        $(VBOX_LIB_VMM_LAZY)
 
   ifeq ($(KBUILD_TARGET),linux)