Changeset 83789 in vbox

Timestamp:

Apr 18, 2020 12:07:16 AM (5 years ago)

Author:

vboxsync

Message:

Main,VBoxNetFlt: For VBoxC and VBoxSVC we need a non-static WinNetConfig. VC++ 14.1 checks and linking fails. bugref:8489

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• Main/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -233 +233 @@
  LIBRARIES.win += WinNetConfig
  WinNetConfig_TEMPLATE = VBOXR3STATIC
+ WinNetConfig_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
  WinNetConfig_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
- WinNetConfig_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
- WinNetConfig_SOURCES  = \
-        win/cfg/VBoxNetCfg.cpp
- WinNetConfig_INCS.win += $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
+ WinNetConfig_INCS.win = $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
+ WinNetConfig_SOURCES  = win/cfg/VBoxNetCfg.cpp
+
+ #
+ # WinNetConfigNonStatic - static library with host network interface config API
+ #
+ LIBRARIES.win += WinNetConfigNonStatic
+ WinNetConfigNonStatic_TEMPLATE = VBoxR3Dll
+ WinNetConfigNonStatic_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ WinNetConfigNonStatic_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
+ WinNetConfigNonStatic_INCS.win = $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
+ WinNetConfigNonStatic_SOURCES  = win/cfg/VBoxNetCfg.cpp
 
  #

trunk/src/VBox/Main/Makefile.kmk

@@ -672 +672 @@
 ifdef VBOX_WITH_NETFLT
  VBoxSVC_LIBS.win += \
-        $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/WinNetConfigNonStatic$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/newdev.lib \
@@ -942 +942 @@
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/newdev.lib \
-        $(PATH_STAGE_LIB)/WinNetConfig$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/WinNetConfigNonStatic$(VBOX_SUFF_LIB) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib