Changeset 92973 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Dec 16, 2021 10:19:00 AM (3 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/Makefile.kmk: One or more of the idl file VBoxNetFltNobjT.idl needs are in the 'um' include dir, so add the WINPSDK to the midl includes. Switched VBoxNetFltNobj to the VBoxR3Static template that includes IPRT. bugref:10116

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (4 diffs)

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

@@ -325 +325 @@
  #
  DLLS.win += VBoxNetFltNobj
- VBoxNetFltNobj_TEMPLATE   = VBOXR3STATIC
+ VBoxNetFltNobj_TEMPLATE   = VBoxR3Static
  if defined(VBOX_SIGNING_MODE)
   VBoxNetFltNobj_INSTTYPE  = none
   VBoxNetFltNobj_DEBUG_INSTTYPE = both
  endif
- VBoxNetFltNobj_SDKS       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
+ VBoxNetFltNobj_SDKS       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
  VBoxNetFltNobj_DEFS       = _WIN32_WINNT=0x0500 WIN32 _ATL_STATIC_REGISTRY
  VBoxNetFltNobj_INCS       = \
@@ -338 +338 @@
         win/nobj/VBoxNetFltNobj.def \
         win/nobj/VBoxNetFltNobj.rc
- VBoxNetFltNobj_LIBS       = \
-        $(VBOX_LIB_RUNTIME_STATIC)
  #VBoxNetFltNobj_INTERMEDIATES =
  VBoxNetFltNobj_DEPS       = \
@@ -360 +358 @@
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxNetFltNobj_0_OUTDIR)) \
                 /cpp_cmd $(VBOX_MIDL_CPP_CMD) \
-                $(qforeachfile unq, incdir, $(SDK_$(VBOX_WINDDK)_INCS),/I $(quote-sh $(incdir))) \
+                $(qforeachfile unq, incdir, $(SDK_$(VBOX_WINDDK)_INCS) $(SDK_$(VBOX_WINPSDK)_INCS),/I $(quote-sh $(incdir))) \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
 else
@@ -366 +364 @@
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxNetFltNobj_0_OUTDIR)) \
                 /cpp_cmd $(VBOX_MIDL_CPP_CMD) \
-                $(foreach incdir, $(SDK_$(VBOX_WINDDK)_INCS),/I $(call VBOX_FN_MAKE_WIN_PATH,$(incdir)) ) \
+                $(foreach incdir, $(SDK_$(VBOX_WINDDK)_INCS) $(SDK_$(VBOX_WINPSDK)_INCS),/I $(call VBOX_FN_MAKE_WIN_PATH,$(incdir)) ) \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
 endif