VirtualBox

Changeset 92974 in vbox for trunk


Ignore:
Timestamp:
Dec 16, 2021 10:37:40 AM (3 years ago)
Author:
vboxsync
Message:

/Config.kmk: Added an VBOX_WIN_INT64 SDK for dealing with the int64.lib location (almost unused these days, but whatever). bugref:10116

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r92966 r92974  
    46054605
    46064606#
     4607# SDK for including int64.lib for x86 targets.
     4608# It conceptually moved from the WDK to the PSDK with W10, as it's now in the um subdir.
     4609#
     4610SDK_VBOX_WIN_INT64 = Abstracts where to find int64.lib for x86 builds.
     4611ifn1of ($(VBOX_WINPSDK), WINPSDK71 WINPSDK80)
     4612 SDK_VBOX_WIN_INT64_LIBS.x86 = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/int64.lib
     4613else
     4614 SDK_VBOX_WIN_INT64_LIBS.x86 = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
     4615 include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
     4616endif
     4617
     4618#
    46074619# Determine Solaris version.
    46084620#
     
    47254737   TEMPLATE_VBoxRc_LDFLAGS          += -IntegrityCheck
    47264738  endif
    4727   TEMPLATE_VBoxRc_LIBS               = \
    4728         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
     4739  TEMPLATE_VBoxRc_SDKS.x86          += VBOX_WIN_INT64
    47294740  TEMPLATE_VBoxRc_LIBS              += \
    47304741        $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
     
    48794890TEMPLATE_VBoxR0_LIBS                = \
    48804891        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
    4881  include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
    4882 TEMPLATE_VBoxR0_LIBS.x86            = \
    4883         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
     4892TEMPLATE_VBoxR0_SDKS.x86           += VBOX_WIN_INT64
    48844893TEMPLATE_VBoxR0_ORDERDEPS           = $(VBOX_SIGN_DRIVER_ORDERDEPS)
    48854894TEMPLATE_VBoxR0_POST_CMDS           = $(VBOX_SIGN_DRIVER_CMDS)
     
    60526061TEMPLATE_VBoxR3StaticNoCrt_LIBS.win        = $(NO_SUCH_VARIABLE)
    60536062TEMPLATE_VBoxR3StaticNoCrt_LIBS.win.x86    = \
    6054         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib \
    60556063        $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj
     6064TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86   += VBOX_WIN_INT64
    60566065TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxR3Static_LDFLAGS.win.x86))
    60576066TEMPLATE_VBoxR3StaticNoCrt_CFLAGS          = $(filter-out -EH%,$(TEMPLATE_VBoxR3Static_CFLAGS)) /GS- -EHs-
     
    61276136ifeq ($(KBUILD_TARGET),win) # No CRT!
    61286137 TEMPLATE_VBOXR3HARDENEDEXE_SDKS          = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
     6138 TEMPLATE_VBOXR3HARDENEDEXE_SDKS.x86      = VBOX_WIN_INT64
    61296139 TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86      = \
    6130         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib \
    61316140        $(PATH_TOOL_$(TEMPLATE_VBOXR3HARDENEDEXE_TOOL.win.x86)_LIB)/chkstk.obj
    61326141 TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS      = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) -GS-
     
    80888097TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win        = $(NO_SUCH_VARIABLE)
    80898098TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win.x86    = \
    8090         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib \
    80918099        $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3NoCrtExe_TOOL.win.x86)_LIB)/chkstk.obj
     8100TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86    = VBOX_WIN_INT64
    80928101TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win.x86))
    80938102TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win     = $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win) /entry:CustomMainEntrypoint /subsystem:console
     
    82118220TEMPLATE_VBOXGUESTR0_EXTENDS     = VBOXR0DRV
    82128221TEMPLATE_VBOXGUESTR0_INST        = $(INST_ADDITIONS)
    8213 TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS)
     8222TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS) VBOX_WIN_INT64
    82148223TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS)
    8215 TEMPLATE_VBOXGUESTR0_LIBS.win.x86   = \
    8216         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/int64.lib
    82178224TEMPLATE_VBOXGUESTR0_DEFS        = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0
    82188225TEMPLATE_VBOXGUESTR0_DEFS.linux  = RT_NO_EXPORT_SYMBOL
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