VirtualBox

Changeset 98256 in vbox


Ignore:
Timestamp:
Jan 23, 2023 5:48:43 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155455
Message:

*.kmk: s/VBOX_NTDLL/VBoxNtDll/ (sdk) bugref:10348

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r98255 r98256  
    50755075# Special SDK for the problematic NTDLL.LIB.
    50765076#
    5077 SDK_VBOX_NTDLL                 := Mini NTDLL import library, required IPRT.
    5078 SDK_VBOX_NTDLL_LIBS.x86        ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-x86.lib
    5079 SDK_VBOX_NTDLL_LIBS.amd64      ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-amd64.lib
     5077SDK_VBoxNtDll                 := Mini NTDLL import library, required by IPRT.
     5078SDK_VBoxNtDll_LIBS.x86        ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-x86.lib
     5079SDK_VBoxNtDll_LIBS.amd64      ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-amd64.lib
    50805080
    50815081#
    … …  
    65716571TEMPLATE_VBoxR3Static_EXTENDS_BY    = appending
    65726572TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH) += VBoxOpenSslStatic
    6573 TEMPLATE_VBoxR3Static_SDKS.win     += VBOX_NTDLL
     6573TEMPLATE_VBoxR3Static_SDKS.win     += VBoxNtDll
    65746574ifeq ($(KBUILD_TARGET),win)
    65756575 TEMPLATE_VBoxR3Static_CFLAGS      += $(VBOX_VCC_WERR)
    … …  
    67456745endif
    67466746ifeq ($(KBUILD_TARGET),win) # No CRT!
    6747  TEMPLATE_VBoxR3HardenedExe_SDKS          = VBOX_NTDLL $(TEMPLATE_VBoxR3Exe_SDKS)
     6747 TEMPLATE_VBoxR3HardenedExe_SDKS          = VBoxNtDll $(TEMPLATE_VBoxR3Exe_SDKS)
    67486748 TEMPLATE_VBoxR3HardenedExe_SDKS.x86      = VBOX_WIN_INT64
    67496749 ifneq ($(VBOX_VCC_LD_GUARD_CF),)
    … …  
    82558255TEMPLATE_VBoxAdvBldProg_EXTENDS = VBoxBldProg
    82568256TEMPLATE_VBoxAdvBldProg_SDKS    = $(TEMPLATE_VBoxBldProg_SDKS)
    8257 TEMPLATE_VBoxAdvBldProg_SDKS.win= $(TEMPLATE_VBoxBldProg_SDKS.win) VBOX_NTDLL
     8257TEMPLATE_VBoxAdvBldProg_SDKS.win= $(TEMPLATE_VBoxBldProg_SDKS.win) VBoxNtDll
    82588258TEMPLATE_VBoxAdvBldProg_DEFS    = $(TEMPLATE_VBoxBldProg_DEFS) IN_RT_R3 IN_ADV_BLD_PROG
    82598259ifeq ($(KBUILD_HOST),win)
    … …  
    83208320 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    83218321  ifdef VBOX_WITH_NOCRT_STATIC
    8322    TEMPLATE_VBoxGuestR3ExeBase_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) VBOX_NTDLL
     8322   TEMPLATE_VBoxGuestR3ExeBase_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) VBoxNtDll
    83238323  else
    8324    TEMPLATE_VBoxGuestR3ExeBase_SDKS    = ReorderCompilerIncs WINSDK10-UCRT-STATIC $(VBOX_WINPSDK_GST) VBOX_NTDLL
     8324   TEMPLATE_VBoxGuestR3ExeBase_SDKS    = ReorderCompilerIncs WINSDK10-UCRT-STATIC $(VBOX_WINPSDK_GST) VBoxNtDll
    83258325  endif
    83268326 else
    8327   TEMPLATE_VBoxGuestR3ExeBase_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK_GST) VBOX_NTDLL
     8327  TEMPLATE_VBoxGuestR3ExeBase_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK_GST) VBoxNtDll
    83288328 endif
    83298329 # Hack for running on NT3x, NT4, W2K and XP w/o SP:

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

    r98255 r98256  
    159159  VBoxDD_TEMPLATE         = VBoxR3DllWarnNoPic
    160160 endif
    161  VBoxDD_SDKS.win         = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
     161 VBoxDD_SDKS.win         = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll
    162162 Storage/DrvHostDVD.cpp_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK)
    163163 VBoxDD_INCS             = \

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

    r98165 r98256  
    548548#
    549549VBoxSupLib_TEMPLATE = VBoxR3StaticNoCrt
    550 VBoxSupLib_SDKS.win = VBOX_NTDLL
     550VBoxSupLib_SDKS.win = VBoxNtDll
    551551VBoxSupLib_LDFLAGS.win.amd64 = -Entry:DllMainEntrypoint
    552552VBoxSupLib_LDFLAGS.win.x86   = -Entry:DllMainEntrypoint

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

    r98169 r98256  
    9797
    9898tstNtQueryStuff_TEMPLATE = VBoxR3TstExe
    99 tstNtQueryStuff_SDKS     = VBOX_NTDLL
     99tstNtQueryStuff_SDKS     = VBoxNtDll
    100100tstNtQueryStuff_SOURCES  = tstNtQueryStuff.cpp
    101101

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

    r98128 r98256  
    267267 TEMPLATE_VBoxNetFltR3 = Template for NetFltInstall, NetFltUninstall, NetAdpInstall, NetAdpUninstall, ++
    268268 TEMPLATE_VBoxNetFltR3_EXTENDS  = VBoxR3Exe
    269  TEMPLATE_VBoxNetFltR3_SDKS     = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL VBOX_WIN_NEWDEV
     269 TEMPLATE_VBoxNetFltR3_SDKS     = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll VBOX_WIN_NEWDEV
    270270 TEMPLATE_VBoxNetFltR3_LIBS     = $(TEMPLATE_VBoxR3Exe_LIBS) \
    271271        $(WinNetConfigExe_1_TARGET) \

  • trunk/src/VBox/Installer/win/Stub/Makefile.kmk

    r98144 r98256  
    5151
    5252VBoxStub_SDKS = \
    53         VBOX_NTDLL
     53        VBoxNtDll
    5454VBoxStub_LIBS += \
    5555        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib

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

    r98255 r98256  
    15021502 endif
    15031503 VBoxProxyStub_DEFS.win.x86 = WIN32
    1504  VBoxProxyStub_SDKS     = VBOX_NTDLL
     1504 VBoxProxyStub_SDKS     = VBoxNtDll
    15051505 VBoxProxyStub_DEFPATH  = $(VBoxCOM_0_OUTDIR)/# Hack to workaround drive letter in $(VBoxCOM_0_OUTDIR)/ for CFLAGS hack below.
    15061506 VBoxProxyStub_INCS     = $(VBoxCOM_0_OUTDIR)/
    … …  
    15301530  DLLS += VBoxProxyStub-x86
    15311531  VBoxProxyStub-x86_TEMPLATE = VBoxMainComp-x86
    1532   VBoxProxyStub-x86_SDKS     = VBOX_NTDLL
     1532  VBoxProxyStub-x86_SDKS     = VBoxNtDll
    15331533  VBoxProxyStub-x86_DEFS     = $(VBoxProxyStub_DEFS) VBOX_PROXY_STUB_32_ON_64 WIN32
    15341534  VBoxProxyStub-x86_INCS     = $(VBoxCOM-x86_0_OUTDIR)/

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

    r98255 r98256  
    27702770VBoxRT_SDKS                   += VBoxSoftFloatR3Shared
    27712771endif
    2772 VBoxRT_SDKS.win                = $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
     2772VBoxRT_SDKS.win                = $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll
    27732773if1of ($(KBUILD_TARGET), win)
    27742774VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE) $(VBOX_INST_TOOLS)

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

    r98249 r98256  
    11071107
    11081108ntGetTimerResolution_SOURCES = ntGetTimerResolution.cpp
    1109 ntGetTimerResolution_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
     1109ntGetTimerResolution_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll
    11101110
    11111111

  • trunk/src/VBox/Storage/testcase/Makefile.kmk

    r98255 r98256  
    182182   vbox-img_LIBS += iconv
    183183  else ifeq ($(KBUILD_TARGET),win)
    184    vbox-img_SDKS.win = VBOX_NTDLL
     184   vbox-img_SDKS.win = VBoxNtDll
    185185  else ifeq ($(KBUILD_TARGET),solaris)
    186186   vbox-img_LIBS += kstat efi
    … …  
    227227  vdkeystoremgr_LIBS += iconv
    228228 else ifeq ($(KBUILD_TARGET),win)
    229   vdkeystoremgr_SDKS.win = VBOX_NTDLL
     229  vdkeystoremgr_SDKS.win = VBoxNtDll
    230230 else ifeq ($(KBUILD_TARGET),solaris)
    231231  vdkeystoremgr_LIBS += kstat

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

    r98249 r98256  
    250250VBoxVMM_SOURCES.win.amd64 += VMMR3/NEMR3Native-win.cpp
    251251VBoxVMM_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM
    252 VBoxVMM_SDKS.win          += VBOX_NTDLL
     252VBoxVMM_SDKS.win          += VBoxNtDll
    253253VMMR3/NEMR3Native-win.cpp_DEFS.amd64 = _AMD64_
    254254VMMR3/NEMR3Native-win.cpp_INCS = \

  • trunk/src/VBox/ValidationKit/Config.kmk

    r98255 r98256  
    8181TEMPLATE_VBoxValidationKitR3_EXTENDS_BY = appending
    8282TEMPLATE_VBoxValidationKitR3_INST = $(INST_VALIDATIONKIT)$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)/
    83 TEMPLATE_VBoxValidationKitR3_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
     83TEMPLATE_VBoxValidationKitR3_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll
    8484TEMPLATE_VBoxValidationKitR3_DEFS = IN_RT_R3
    8585TEMPLATE_VBoxValidationKitR3_LIBS.darwin = iconv
Note: See TracChangeset for help on using the changeset viewer.

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