Changeset 98258 in vbox

Timestamp:

Jan 23, 2023 5:54:17 PM (2 years ago)

Author:

vboxsync

Message:

/Config.kmk: s/VBOX_WIN_INT64/VBoxWinInt64Lib/ (sdk) bugref:10348

File:

• trunk/Config.kmk (modified) (8 diffs)

trunk/Config.kmk

@@ -5096 +5096 @@
 # It conceptually moved from the WDK to the PSDK with W10, as it's now in the um subdir.
 #
-SDK_VBOX_WIN_INT64             := Abstracts where to find int64.lib for x86 builds.
+SDK_VBoxWinInt64Lib             := Abstracts where to find int64.lib for x86 builds.
 ifn1of ($(VBOX_WINPSDK), WINPSDK71 WINPSDK80)
- SDK_VBOX_WIN_INT64_LIBS.x86     = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/int64.lib
+ SDK_VBoxWinInt64Lib_LIBS.x86    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/int64.lib
  ifeq ($(KBUILD_TARGET),win)
   include $(KBUILD_PATH)/sdks/$(VBOX_WINPSDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
  endif
 else
- SDK_VBOX_WIN_INT64_LIBS.x86    = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
+ SDK_VBoxWinInt64Lib_LIBS.x86    = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
  ifeq ($(KBUILD_TARGET),win)
   include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
@@ -5230 +5230 @@
    TEMPLATE_VBoxRc_LDFLAGS          += -IntegrityCheck
   endif
-  TEMPLATE_VBoxRc_SDKS.x86          += VBOX_WIN_INT64
+  TEMPLATE_VBoxRc_SDKS.x86          += VBoxWinInt64Lib
   TEMPLATE_VBoxRc_LIBS              += \
         $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
@@ -5401 +5401 @@
   include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
  endif
-TEMPLATE_VBoxR0_SDKS.x86           += VBOX_WIN_INT64
+TEMPLATE_VBoxR0_SDKS.x86           += VBoxWinInt64Lib
 TEMPLATE_VBoxR0_ORDERDEPS           = $(VBOX_SIGN_DRIVER_ORDERDEPS)
 TEMPLATE_VBoxR0_POST_CMDS           = $(VBOX_SIGN_DRIVER_CMDS)
@@ -6447 +6447 @@
   ifdef VBOX_WITH_NOCRT_STATIC
    TEMPLATE_VBoxR3StaticBase_SDKS          = $(subst WINSDK10-UCRT,,$(TEMPLATE_VBoxR3Exe_SDKS))
-   TEMPLATE_VBoxR3StaticBase_SDKS.x86      = $(TEMPLATE_VBoxR3Exe_SDKS.x86) VBOX_WIN_INT64  ## @todo drop this asap. @bugref{10261}
+   TEMPLATE_VBoxR3StaticBase_SDKS.x86      = $(TEMPLATE_VBoxR3Exe_SDKS.x86) VBoxWinInt64Lib  ## @todo drop this asap. @bugref{10261}
   else
    TEMPLATE_VBoxR3StaticBase_SDKS          = $(subst WINSDK10-UCRT, WINSDK10-UCRT-STATIC,$(TEMPLATE_VBoxR3Exe_SDKS))
@@ -6703 +6703 @@
         $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj
  endif
-TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86   += VBOX_WIN_INT64
+TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86   += VBoxWinInt64Lib
 TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))
 TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxR3Static_LDFLAGS.win.x86))
@@ -6746 +6746 @@
 ifeq ($(KBUILD_TARGET),win) # No CRT!
  TEMPLATE_VBoxR3HardenedExe_SDKS          = VBoxNtDll $(TEMPLATE_VBoxR3Exe_SDKS)
- TEMPLATE_VBoxR3HardenedExe_SDKS.x86      = VBOX_WIN_INT64
+ TEMPLATE_VBoxR3HardenedExe_SDKS.x86      = VBoxWinInt64Lib
  ifneq ($(VBOX_VCC_LD_GUARD_CF),)
   TEMPLATE_VBoxR3HardenedExe_CXXFLAGS       = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CXXFLAGS))
@@ -8601 +8601 @@
 TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win.x86    = \
         $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3NoCrtExe_TOOL.win.x86)_LIB)/chkstk.obj
-TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86    = VBOX_WIN_INT64
+TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86    = VBoxWinInt64Lib
 TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS))
 TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win.x86))
@@ -8689 +8689 @@
 TEMPLATE_VBoxGuestR0Drv_EXTENDS     = VBoxR0Drv
 TEMPLATE_VBoxGuestR0Drv_INST        = $(INST_ADDITIONS)
-TEMPLATE_VBoxGuestR0Drv_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS) VBOX_WIN_INT64
+TEMPLATE_VBoxGuestR0Drv_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS) VBoxWinInt64Lib
 TEMPLATE_VBoxGuestR0Drv_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS)
 TEMPLATE_VBoxGuestR0Drv_DEFS        = $(TEMPLATE_VBoxR0Drv_DEFS) IN_GUEST IN_GUEST_R0