VirtualBox

Changeset 92910 in vbox


Ignore:
Timestamp:
Dec 14, 2021 10:18:50 PM (3 years ago)
Author:
vboxsync
Message:

/Config.kmk,*.kmk: Preparing to switch to Windows 10 SDK. bugref:10116

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r92856 r92910  
    19281928# Decide which Windows SDK to use by default.
    19291929#
    1930 if1of ($(VBOX_VCC_TOOL_STEM), VCC110)
    1931  VBOX_WINPSDK ?= WINPSDK80
     1930ifdef VBOX_WITH_NEW_WINDOWS_SDK
     1931 VBOX_WINPSDK      ?= WINSDK10-UM
     1932 VBOX_WINPSDK_INCS ?= $(VBOX_WINPSDK)-INCS
     1933else if1of ($(VBOX_VCC_TOOL_STEM), VCC110)
     1934 VBOX_WINPSDK      ?= WINPSDK80
     1935 VBOX_WINPSDK_INCS ?= $(VBOX_WINPSDK)INCS
    19321936else
    1933  VBOX_WINPSDK ?= WINPSDK71
     1937 VBOX_WINPSDK      ?= WINPSDK71
     1938 VBOX_WINPSDK_INCS ?= $(VBOX_WINPSDK)INCS
    19341939endif
    19351940VBOX_WINPSDK_GST      ?= $(VBOX_WINPSDK)
    1936 VBOX_WINPSDK_GST_W8   ?= WINPSDK80
     1941VBOX_WINPSDK_GST_INCS ?= $(VBOX_WINPSDK_INCS)
     1942ifneq ($(VBOX_WINPSDK_GST),WINPSDK71)
     1943 VBOX_WINPSDK_GST_W8  ?= $(VBOX_WINPSDK_GST)
     1944else
     1945 VBOX_WINPSDK_GST_W8  ?= WINPSDK80
     1946endif
    19371947VBOX_WINPSDK_GST_W7   ?= $(VBOX_WINPSDK_GST)
    19381948VBOX_WINPSDK_GST_WLH  ?= $(VBOX_WINPSDK_GST)
    … …  
    23342344# Note! The scripts has been moved to Bin in v8.0.
    23352345VBOX_PATH_WIX       ?= $(KBUILD_DEVTOOLS)/win.x86/wix/v3.8.1128.0
     2346ifdef VBOX_WITH_NEW_WINDOWS_SDK
     2347VBOX_PATH_MSITRAN   ?= $(PATH_SDK_WINSDK10_BIN)/MsiTran.Exe
     2348VBOX_PATH_MSIDB     ?= $(PATH_SDK_WINSDK10_BIN)/MsiDb.Exe
     2349VBOX_PATH_WISUBSTG  ?= $(PATH_SDK_WINSDK10_BIN)/WiSubStg.vbs
     2350VBOX_PATH_WISUMINFO ?= $(PATH_SDK_WINSDK10_BIN)/WiSumInf.vbs
     2351else
    23362352VBOX_PATH_MSITRAN   ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiTran.Exe
    23372353VBOX_PATH_MSIDB     ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiDb.Exe
    23382354VBOX_PATH_WISUBSTG  ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSubStg.vbs
    23392355VBOX_PATH_WISUMINFO ?= $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSumInf.vbs
     2356endif
    23402357VBOX_PATH_DIFX      ?= $(KBUILD_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1-r3
    23412358
    … …  
    23502367# The Microsoft IDL compiler (the SDK build needs this on non-Windows).
    23512368VBOX_WIN_MIDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard $(addsuffix /[Mm][Ii][Dd][Ll].[Ee][Xx][Ee], \
     2369        $(PATH_SDK_$(VBOX_WINPSDK)_BIN) \
    23522370        $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin$(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "win.amd64",/x64,) \
    23532371        $(KBUILD_DEVTOOLS)/win.x86/ddk/7600.16385.1/bin/x86 \
    … …  
    33903408endif
    33913409VBOX_VCC_WARN_ALL += -wd4242 -wd4244
     3410#    -wd4548: socket.cpp(1931): warning C4548: expression before comma has no effect; expected expression with side-effect
     3411VBOX_VCC_WARN_ALL += -wd4548
     3412ifndef VBOX_WITH_NEW_WINDOWS_SDK
     3413 #    -wd5031: iprt/win/windows.h(55): warning C5031: #pragma warning(pop): likely mismatch, popping warning state pushed in different file
     3414 #    -wd5032: iprt/win/windows.h(37): warning C5032: detected #pragma warning(push) with no corresponding #pragma warning(pop)
     3415 VBOX_VCC_WARN_ALL += -wd5031 -wd5032
     3416endif
    33923417ifndef VBOX_NEWER_VCC_WARN_ALL
    33933418 if "$(VBOX_VCC_TOOL_STEM)" < "VCC120"
    … …  
    81598184TEMPLATE_VBOXGUESTR0_EXTENDS     = VBOXR0DRV
    81608185TEMPLATE_VBOXGUESTR0_INST        = $(INST_ADDITIONS)
    8161 TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
    8162 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
     8186TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS)
     8187TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS)
    81638188TEMPLATE_VBOXGUESTR0_LIBS.win.x86   = \
    81648189        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/int64.lib

  • trunk/include/Makefile.kmk

    r88058 r92910  
    216216LIBRARIES += SyntaxVBoxIncludeR0Drv
    217217SyntaxVBoxIncludeR0Drv_TEMPLATE = VBoxR0DrvLib
    218 SyntaxVBoxIncludeR0Drv_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
     218SyntaxVBoxIncludeR0Drv_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
    219219SyntaxVBoxIncludeR0Drv_DEFS = VBOX_WITH_HGCM USING_VMM_COMMON_DEFS
    220220SyntaxVBoxIncludeR0Drv_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r92847 r92910  
    457457# Various Windows hosts libraries:
    458458VirtualBox_LIBS.win = \
    459         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
    460         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
    461         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
     459        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib
     460ifdef VBOX_WITH_NEW_WINDOWS_SDK
     461 VirtualBox_LIBS.win += \
     462        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ddraw.lib \
     463        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/dxguid.lib
     464else
     465 VirtualBox_LIBS.win += \
     466        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
     467        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
     468endif
    462469
    463470# VBox keyboard shared library for X11 hosts:
    … …  
    510517# Various Windows hosts libraries:
    511518VirtualBoxVM_LIBS.win = \
    512         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
    513         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
    514         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
     519        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib
     520ifdef VBOX_WITH_NEW_WINDOWS_SDK
     521 VirtualBoxVM_LIBS.win += \
     522        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/ddraw.lib \
     523        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/dxguid.lib
     524else
     525 VirtualBoxVM_LIBS.win += \
     526        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
     527        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
     528endif
    515529
    516530# VBox keyboard shared library for X11 hosts:

  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r92408 r92910  
    559559SUPR0IdcClient_TEMPLATE = VBoxR0DrvLib
    560560SUPR0IdcClient_DEFS = IN_RT_R0 IN_SUP_R0 IN_SUP_STATIC
    561 SUPR0IdcClient_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
     561SUPR0IdcClient_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
    562562SUPR0IdcClient_SOURCES.$(KBUILD_TARGET) = \
    563563        $(KBUILD_TARGET)/SUPR0IdcClient-$(KBUILD_TARGET).c
    … …  
    625625 VBoxDrv_INST.darwin      = $(INST_VBOXDRV)Contents/MacOS/
    626626 VBoxDrv_DEBUG_INST.darwin= $(patsubst %/,%,$(INST_VBOXDRV))
    627  VBoxDrv_SDKS.win         = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
     627 VBoxDrv_SDKS.win         = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
    628628
    629629 VBoxDrv_DEFS            := IN_RT_R0 IN_SUP_R0 SUPDRV_WITH_RELEASE_LOGGER VBOX_SVN_REV=$(VBOX_SVN_REV)

  • trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

    r82968 r92910  
    106106 VBoxNetAdp6_DEFS = IN_RT_R0 IN_SUP_STATIC
    107107 VBoxNetAdp6_INCS := $(PATH_SUB_CURRENT)
    108  VBoxNetAdp6_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
     108 VBoxNetAdp6_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK_INCS)
    109109 VBoxNetAdp6_SOURCES = \
    110110        win/VBoxNetAdp-win.cpp \

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

    r84541 r92910  
    4545 VBoxNetFlt_SOURCES.darwin = \
    4646        darwin/VBoxNetFlt-darwin.cpp
    47  VBoxNetFlt_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
     47 VBoxNetFlt_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK_INCS)
    4848 VBoxNetFlt_SOURCES.win = \
    4949        win/drv/VBoxNetFltP-win.cpp \
    … …  
    165165 VBoxNetLwf_INCS = .
    166166 VBoxNetLwf_SOURCES = VBoxNetFlt.c VBoxNetFlt.rc
    167  VBoxNetLwf_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
     167 VBoxNetLwf_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK_INCS)
    168168 VBoxNetLwf_SOURCES.win = \
    169169        win/drv/VBoxNetLwf-win.cpp
    … …  
    427427 VBoxNetAdp_DEFS = IN_RT_R0 IN_SUP_STATIC
    428428 VBoxNetAdp_INCS := $(PATH_SUB_CURRENT)
    429  VBoxNetAdp_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
     429 VBoxNetAdp_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK_INCS)
    430430 VBoxNetAdp_SOURCES = \
    431431        VBoxNetFlt.c \

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

    r84540 r92910  
    4747 VBoxUSB_DEBUG_INSTTYPE = both
    4848endif
    49 VBoxUSB_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
     49VBoxUSB_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
    5050ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    5151 VBoxUSB_DEFS      := IN_RT_R0 IN_SUP_R0 VBOX_DBG_LOG_NAME="USBDev"
    … …  
    7878endif
    7979VBoxUSBMon_INCS       := $(PATH_SUB_CURRENT)/..
    80 VBoxUSBMon_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
     80VBoxUSBMon_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
    8181VBoxUSBMon_DEFS        = IN_RT_R0 IN_SUP_R0 NTDDI_WINNT=_NTDDI_VISTA VBOXUSBFILTERMGR_USB_SPINLOCK
    8282ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING

  • trunk/src/VBox/Main/Makefile.kmk

    r92153 r92910  
    12261226 VBoxClient-x86_LIBS.win = $(NO_SUCH_VARIABLE)
    12271227 VBoxClient-x86_LIBS.win.x86 += \
    1228     $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib \
    1229         $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/WbemUuid.Lib
     1228        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib \
     1229        $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/WbemUuid.Lib
    12301230 VBoxClient-x86_CLEAN.win += $(VBoxClient-x86_0_OUTDIR)/VBoxClient-x86.rgs
    12311231 $(call KB_FN_DO_PASS0_ON_TARGET,VBoxClient-x86) # Sets VBoxClient-x86_0_OUTDIR
    … …  
    15821582        $(QUIET)$(MV) -f "$1" "$1.tmp"
    15831583        $(QUIET)$(APPEND) -nt "$1" \
     1584                '#if _MSC_VER >= 1920 /* RT_MSC_VER_VS2019 */' \
     1585                '# pragma warning(disable:5031 5032) /* buggy winioctl.h in some w10 sdks */ ' \
     1586               '#endif' \
    15841587                '#pragma warning(push) /* -Wall and windows.h */' \
    15851588                '#pragma warning(disable:4668 4255)' \
    … …  
    16151618                /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxCOM_0_OUTDIR)) \
    16161619                /cpp_cmd $(VBOX_MIDL_CPP_CMD) \
    1617                 /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_$(VBOX_WINPSDK)_INC)) \
     1620                $(foreachfile dir,$(SDK_$(VBOX_WINPSDK)_INCS),/I $(call VBOX_FN_MAKE_WIN_PATH,$(dir))) \
    16181621                /I idl \
    16191622                $(call VBOX_FN_MAKE_WIN_PATH,$(VBOX_IDL_FILE.MSCOM))
    … …  
    16401643                /out $(call VBOX_FN_MAKE_WIN_PATH,$(dir $@)) \
    16411644                /cpp_cmd $(VBOX_MIDL_CPP_CMD) \
    1642                 /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_$(VBOX_WINPSDK)_INC)) \
     1645                $(foreachfile dir,$(SDK_$(VBOX_WINPSDK)_INCS),/I $(call VBOX_FN_MAKE_WIN_PATH,$(dir))) \
    16431646                /I idl \
    16441647                $(call VBOX_FN_MAKE_WIN_PATH,$(VBOX_IDL_FILE.MSCOM))
    … …  
    16621665                /tlb $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox-x86.tlb) \
    16631666                /cpp_cmd $(VBOX_MIDL_CPP_CMD_X86) \
    1664                 /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_$(VBOX_WINPSDK)_INC)) \
     1667                $(foreachfile dir,$(SDK_$(VBOX_WINPSDK)_INCS),/I $(call VBOX_FN_MAKE_WIN_PATH,$(dir))) \
    16651668                /I idl \
    16661669                $(call VBOX_FN_MAKE_WIN_PATH,$(VBOX_IDL_FILE.MSCOM))

  • trunk/src/VBox/Runtime/Makefile.kmk

    r92818 r92910  
    29122912#
    29132913RuntimeR0Drv_TEMPLATE   = VBoxR0DrvLib
    2914 RuntimeR0Drv_SDKS.win   = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS VBOX_OPENSSL
     2914RuntimeR0Drv_SDKS.win   = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS) VBOX_OPENSSL
    29152915RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL NOFILEID
    29162916RuntimeR0Drv_DEFS.win   = IN_SUP_R0 LDR_ONLY_PE IPRT_WITHOUT_DIGEST_MD4
    … …  
    39403940$(IPRT_OUT_DIR)/errmsgwindata.h: \
    39413941                $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsgcom.sed \
    3942                 $$(PATH_SDK_$(VBOX_WINPSDK)_INC)/WinError.h \
     3942                $$(qwildcard ,$$(qaddsuffix ,/WinError.h,$$(SDK_$$(VBOX_WINPSDK)_INCS))) \
    39433943                | $$(dir $$@)
    39443944        $(call MSG_GENERATE,,$@,$(filter %.h,$^))
    3945         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
     3945        $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< "$(filter %.h,$^)"
    39463946
    39473947$(IPRT_OUT_DIR)/errmsgvboxcomdata.h.ts +| $(IPRT_OUT_DIR)/errmsgvboxcomdata.h: \

  • trunk/src/VBox/VMM/Makefile.kmk

    r92444 r92910  
    579579        VMMR0/NEMR0NativeA-win.asm
    580580VMMR0_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0
    581 VMMR0/NEMR0Native-win.cpp_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
     581VMMR0/NEMR0Native-win.cpp_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
    582582
    583583VMMR0_SOURCES.darwin.amd64 += \
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