VirtualBox

Changeset 92966 in vbox for trunk


Ignore:
Timestamp:
Dec 16, 2021 9:55:42 AM (3 years ago)
Author:
vboxsync
Message:

/Config.kmk: Adjustments for using the W11 WDK for building. We still need the windows 7 WDK for older stuff, at least for now. This introduces a VBOX_WIN_NEWDEV SDK that adds newdev.lib to LIBS, as this library kind of moved from the WINDDK* to WINSDK10-UM. bugref:10116

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r92933 r92966  
    19041904# Decide which Windows DDK to use by default.
    19051905#
    1906 if1of ($(VBOX_VCC_TOOL_STEM), VCC110)
     1906ifdef VBOX_WITH_NEW_WINDOWS_DDK
     1907 VBOX_WINDDK         ?= WINSDK10-KM
     1908 VBOX_WINDDK_WLH     ?= $(VBOX_WINDDK)
     1909 VBOX_WINDDK_GST_W8  ?= WINSDK10-KM-W8
     1910 VBOX_WINDDK_GST_W7  ?= WINSDK10-KM-W7
     1911 VBOX_WINDDK_GST_WLH ?= WINDDK71WLH
     1912else if1of ($(VBOX_VCC_TOOL_STEM), VCC110)
    19071913 VBOX_WINDDK         ?= WINDDK80
    19081914else
     
    45864592
    45874593#
     4594# SDK for including newdev.lib.
     4595# It conceptually moved from the WDK to the PSDK with W10, as it's now in the um subdir.
     4596#
     4597SDK_VBOX_WIN_NEWDEV = Abstracts where to find newdev.lib.
     4598ifn1of ($(VBOX_WINPSDK), WINPSDK71 WINPSDK80)
     4599 SDK_VBOX_WIN_NEWDEV_LIBS.x86   = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/newdev.lib
     4600 SDK_VBOX_WIN_NEWDEV_LIBS.amd64 = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.amd64)/newdev.lib
     4601else
     4602 SDK_VBOX_WIN_NEWDEV_LIBS.x86   = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/newdev.lib
     4603 SDK_VBOX_WIN_NEWDEV_LIBS.amd64 = $(PATH_SDK_$(VBOX_WINDDK)_LIB.amd64)/newdev.lib
     4604endif
     4605
     4606#
    45884607# Determine Solaris version.
    45894608#
     
    50065025 endif
    50075026 TEMPLATE_VBOXR0DRV_RCDEFS             = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000)
     5027 TEMPLATE_VBOXR0DRV_DEFS              += _KERNEL_MODE=1            # Needed with W10 to access things like KeQueryInterruptTime
    50085028 TEMPLATE_VBOXR0DRV_DEFS.x86           = _X86_
    50095029 TEMPLATE_VBOXR0DRV_DEFS.x86          += NO_INTERLOCKED_INTRINSICS # Avoids intrisic VC/WDK trouble
     
    50115031 TEMPLATE_VBOXR0DRV_DEFS.amd64         = _AMD64_
    50125032 TEMPLATE_VBOXR0DRV_DEFS.amd64        += WIN9X_COMPAT_SPINLOCK     # For Windows 8+ WDKs where it is no longer inlined but imported from ntoskrnl.
     5033 TEMPLATE_VBOXR0DRV_DEFS.amd64        += NT_INLINE_IRQL NT_INLINE_GET_CURRENT_IRQL # Prevent W10 WDK from importing KeLowerIrql and KeGetCurrentIrql.
    50135034 TEMPLATE_VBOXR0DRV_DEFS.win           = IPRT_NT_MAP_TO_ZW
    50145035 TEMPLATE_VBOXR0DRV_CXXFLAGS           = -Zi -Zl -GR- -EHs- -GF -Gz -GS- -Zc:wchar_t- $(VBOX_VCC_FP) -Gs4096 $(VBOX_VCC_OPT) \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette