Changeset 34098 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 16, 2010 10:40:59 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67797

Message:

Windows Guest Additions: Added own NSIS plugin VBoxInstallHelper.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• InstallHelper (added)
• InstallHelper/Makefile.kmk (added)
• InstallHelper/VBoxGuestInstallHelper.cpp (added)
• InstallHelper/VBoxGuestInstallHelper.rc (added)
• InstallHelper/exdll.h (added)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -21 +21 @@
 # Include Sub-Makefiles.
 include $(PATH_SUB_CURRENT)/Loader/Makefile.kmk
+include $(PATH_SUB_CURRENT)/InstallHelper/Makefile.kmk
 
 # Globals
 VBOX_PATH_WIN_ADD_INS_SRC := $(PATH_SUB_CURRENT)
 VBOX_PATH_ADDITIONS.win.x86 := $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions
+VBOX_WITH_GUEST_INSTALL_HELPER := 1 # Use our guest install helper DLL.
 
 ## @todo VBOX_WIN_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/Installer/win
@@ -149 +151 @@
         -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \
         -E 'PATH_TARGET=$(subst /,\,$(PATH_TARGET))' \
+        -E 'PATH_TARGET_X86=$(subst /,\,$(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/obj)' \
         -E 'VBOX_PATH_ADDITIONS_WIN_X86=$(subst /,\,$(VBOX_PATH_ADDITIONS.win.x86))' \
         -E 'VBOX_VENDOR=$(VBOX_VENDOR)' \
@@ -162 +165 @@
         -E 'VBOX_NSIS_ICON_FILE=$(subst /,\,$(VBOX_NSIS_ICON_FILE))' \
         -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),1,0)' \
+        -E 'VBOX_WITH_GUEST_INSTALL_HELPER=$(if $(VBOX_WITH_GUEST_INSTALL_HELPER),1,0)' \
         -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \