- Timestamp:
- Jun 16, 2015 4:47:07 PM (10 years ago)
- Location:
- trunk/src/VBox/Installer/win
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/win/Makefile.kmk
r56299 r56461 58 58 # List of merge modules to use. 59 59 # 60 VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt Python60 VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt NetAdp6 NetLwf Python 61 61 ifeq ($(KBUILD_TARGET_ARCH),amd64) 62 62 VBOX_INSTALLER_MERGE_MODULES += COM32On64 -
trunk/src/VBox/Installer/win/VirtualBox.wxs
r56299 r56461 426 426 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 427 427 <MergeRef Id="msm_VBoxNetworkFlt" /> 428 <MergeRef Id="msm_VBoxNetworkLwf" /> 428 429 <?else ?> 429 430 <ComponentRef Id="cp_NetFltDriver" /> … … 437 438 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?> 438 439 <MergeRef Id="msm_VBoxNetworkAdp" /> 440 <MergeRef Id="msm_VBoxNetworkAdp6" /> 439 441 <?else ?> 440 442 <ComponentRef Id="cp_NetAdpDriver" />
Note:
See TracChangeset
for help on using the changeset viewer.