Changeset 98257 in vbox

Timestamp:

Jan 23, 2023 5:51:48 PM (2 years ago)

Author:

vboxsync

Message:

*.kmk: s/VBOX_WIN_NEWDEV/VBoxWinNewDevLib/ (sdk) bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/win/InstallHelper/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -5083 +5083 @@
 # It conceptually moved from the WDK to the PSDK with W10, as it's now in the um subdir.
 #
-SDK_VBOX_WIN_NEWDEV            := Abstracts where to find newdev.lib.
+SDK_VBoxWinNewDevLib            := Abstracts where to find newdev.lib.
 ifn1of ($(VBOX_WINPSDK), WINPSDK71 WINPSDK80)
- SDK_VBOX_WIN_NEWDEV_LIBS.x86   = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/newdev.lib
- SDK_VBOX_WIN_NEWDEV_LIBS.amd64 = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.amd64)/newdev.lib
+ SDK_VBoxWinNewDevLib_LIBS.x86   = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/newdev.lib
+ SDK_VBoxWinNewDevLib_LIBS.amd64 = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.amd64)/newdev.lib
 else
- SDK_VBOX_WIN_NEWDEV_LIBS.x86   = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/newdev.lib
- SDK_VBOX_WIN_NEWDEV_LIBS.amd64 = $(PATH_SDK_$(VBOX_WINDDK)_LIB.amd64)/newdev.lib
+ SDK_VBoxWinNewDevLib_LIBS.x86   = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/newdev.lib
+ SDK_VBoxWinNewDevLib_LIBS.amd64 = $(PATH_SDK_$(VBOX_WINDDK)_LIB.amd64)/newdev.lib
 endif
 

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

@@ -63 +63 @@
 endif
 VBoxDrvInst_DEPS    = $(VBOX_SVN_REV_KMK)
-VBoxDrvInst_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) $(VBOX_WINDDK_GST) VBOX_WIN_NEWDEV
+VBoxDrvInst_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) $(VBOX_WINDDK_GST) VBoxWinNewDevLib
 VBoxDrvInst_INCS    = ../include
 VBoxDrvInst_LIBS    = \

trunk/src/VBox/Devices/Makefile.kmk

@@ -122 +122 @@
     efi
  if defined(VBOX_WITH_USB) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
-  VBoxDDU_SDKS.win       += VBOX_WIN_NEWDEV
+  VBoxDDU_SDKS.win       += VBoxWinNewDevLib
   VBoxDDU_LIBS           += \
         $(PATH_STAGE_LIB)/USBLib$(VBOX_SUFF_LIB)

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

@@ -267 +267 @@
  TEMPLATE_VBoxNetFltR3 = Template for NetFltInstall, NetFltUninstall, NetAdpInstall, NetAdpUninstall, ++
  TEMPLATE_VBoxNetFltR3_EXTENDS  = VBoxR3Exe
- TEMPLATE_VBoxNetFltR3_SDKS     = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll VBOX_WIN_NEWDEV
+ TEMPLATE_VBoxNetFltR3_SDKS     = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll VBoxWinNewDevLib
  TEMPLATE_VBoxNetFltR3_LIBS     = $(TEMPLATE_VBoxR3Exe_LIBS) \
         $(WinNetConfigExe_1_TARGET) \

trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk

@@ -123 +123 @@
 TEMPLATE_VBoxUsbR3 = Template for USBInstalls, USBUninstall and USBTest
 TEMPLATE_VBoxUsbR3_EXTENDS  = VBoxR3Exe
-TEMPLATE_VBoxUsbR3_SDKS     = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_WIN_NEWDEV
+TEMPLATE_VBoxUsbR3_SDKS     = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxWinNewDevLib
 TEMPLATE_VBoxUsbR3_CXXFLAGS = $(TEMPLATE_VBoxR3Exe_CXXFLAGS) -Gz
 TEMPLATE_VBoxUsbR3_CFLAGS   = $(TEMPLATE_VBoxR3Exe_CFLAGS) -Gz

trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

@@ -35 +35 @@
 VBoxInstallHelper_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBOX_SVN_REV=$(VBOX_SVN_REV)
 ifdef VBOX_WITH_NETFLT
- VBoxInstallHelper_SDKS   += VBOX_WIN_NEWDEV
+ VBoxInstallHelper_SDKS   += VBoxWinNewDevLib
  VBoxInstallHelper_DEFS   += VBOX_WITH_NETFLT=1
 endif

trunk/src/VBox/Main/Makefile.kmk

@@ -771 +771 @@
 
 ifdef VBOX_WITH_NETFLT
- VBoxSVC_SDKS.win += VBOX_WIN_NEWDEV
+ VBoxSVC_SDKS.win += VBoxWinNewDevLib
  VBoxSVC_LIBS.win += \
         $(PATH_STAGE_LIB)/WinNetConfigDll$(VBOX_SUFF_LIB) \
@@ -1082 +1082 @@
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
 ifdef VBOX_WITH_NETFLT
- VBoxC_SDKS.win += VBOX_WIN_NEWDEV
+ VBoxC_SDKS.win += VBoxWinNewDevLib
  VBoxC_LIBS.win += \
         $(PATH_STAGE_LIB)/WinNetConfigDll$(VBOX_SUFF_LIB) \