VirtualBox

Changeset 56461 in vbox for trunk


Ignore:
Timestamp:
Jun 16, 2015 4:47:07 PM (10 years ago)
Author:
vboxsync
Message:

Installer/win: fix MSM installer package creation

Location:
trunk/src/VBox/Installer/win
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Installer/win/Makefile.kmk

    r56299 r56461  
    5858# List of merge modules to use.
    5959#
    60 VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt Python
     60VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt NetAdp6 NetLwf Python
    6161ifeq ($(KBUILD_TARGET_ARCH),amd64)
    6262 VBOX_INSTALLER_MERGE_MODULES += COM32On64
  • trunk/src/VBox/Installer/win/VirtualBox.wxs

    r56299 r56461  
    426426    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    427427                <MergeRef Id="msm_VBoxNetworkFlt" />
     428                <MergeRef Id="msm_VBoxNetworkLwf" />
    428429    <?else ?>
    429430                <ComponentRef Id="cp_NetFltDriver" />
     
    437438    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    438439                <MergeRef Id="msm_VBoxNetworkAdp" />
     440                <MergeRef Id="msm_VBoxNetworkAdp6" />
    439441    <?else ?>
    440442                <ComponentRef Id="cp_NetAdpDriver" />
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette