VirtualBox

Changeset 84411 in vbox


Ignore:
Timestamp:
May 20, 2020 2:31:23 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
138108
Message:

*.kmk: VC++ 14.0 adjustments (just follow where 14.1 leads). bugref:8489

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r84392 r84411  
    31913191 VBOX_VCC120_WARN_ALL := $(VBOX_VCC_WARN_ALL)
    31923192endif
    3193 if1of ($(VBOX_VCC_TOOL_STEM), VCC141 VCC142)
     3193if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    31943194 #    -wd5045: Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
    31953195 #    -wd5039: 'RTStrSpaceDestroy': pointer or reference to potentially throwing function passed to extern C function under -EHc. Undefined behavior may occur if this function throws an exception.
    … …  
    40524052        $(RM) -f -- "$@"
    40534053        $(CP) -- "$(quote-sh-dq $<)" "$@"
     4054        $(CHMOD) a+rw -- "$@"
    40544055        $(VBOX_VCC_EDITBIN) /LargeAddressAware /DynamicBase /NxCompat /Release /IntegrityCheck \
    40554056                /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
    … …  
    40734074        $(RM) -f -- "$@"
    40744075        $(CP) -- "$<" "$@"
     4076        $(CHMOD) a+rw -- "$@"
    40754077        $(VBOX_VCC_EDITBIN) /LargeAddressAware /DynamicBase /NxCompat /Release /IntegrityCheck \
    40764078                /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
    … …  
    47044706ifeq ($(KBUILD_TARGET),win)
    47054707 TEMPLATE_VBOXR0DRV_TOOL               = $(VBOX_VCC_TOOL)
    4706  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141" # for stddef.h
     4708 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140" # for stddef.h ## @todo 8489: check if still needed
    47074709  TEMPLATE_VBOXR0DRV_SDKS              = WINSDK10-UCRT-INCS
    47084710 endif
    … …  
    52235225 TEMPLATE_VBOXR3EXE_TOOL.win.amd64     = $(VBOX_VCC_TOOL_STEM)AMD64
    52245226 TEMPLATE_VBOXR3EXE_RCDEFS             = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000)
    5225  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     5227 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    52265228  TEMPLATE_VBOXR3EXE_SDKS              = ReorderCompilerIncs WINSDK10-UCRT $(VBOX_WINPSDK)
    52275229 else
    … …  
    52585260 endif
    52595261
    5260  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     5262 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    52615263  TEMPLATE_VBOXR3EXE_LIBS.x86           = \
    52625264        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.x86)_LIB)/vcruntime$(VBOX_VCC_CRT_TYPE).lib \
    … …  
    55315533TEMPLATE_VBOXR3STATIC_DEFS             = IN_RT_STATIC IN_RT_R3 IN_SUP_STATIC $(TEMPLATE_VBOXR3EXE_DEFS)
    55325534ifeq ($(KBUILD_TARGET),win)
    5533  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     5535 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    55345536  TEMPLATE_VBOXR3STATIC_SDKS           = $(subst WINSDK10-UCRT, WINSDK10-UCRT-STATIC,$(TEMPLATE_VBOXR3EXE_SDKS))
    55355537 endif
    … …  
    55515553        /DISALLOWLIB:ucrt.lib \
    55525554        /DISALLOWLIB:ucrtd.lib
    5553  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     5555 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    55545556  TEMPLATE_VBOXR3STATIC_LIBS.x86           = \
    55555557        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.x86)_LIB)/libvcruntime$(VBOX_VCC_CRT_TYPE).lib \
    … …  
    62216223 TEMPLATE_VBOXMAINEXE_TOOL.win.x86       = $(VBOX_VCC_TOOL_STEM)X86
    62226224 TEMPLATE_VBOXMAINEXE_TOOL.win.amd64     = $(VBOX_VCC_TOOL_STEM)AMD64
    6223  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     6225 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    62246226  TEMPLATE_VBOXMAINEXE_SDKS              = ReorderCompilerIncs WINSDK10-UCRT $(VBOX_WINPSDK) $(VBOX_WINDDK)
    62256227 else
    … …  
    62676269 TEMPLATE_VBOXMAINEXE_LIBS               = \
    62686270        $(LIB_RUNTIME)
    6269  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     6271 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    62706272  TEMPLATE_VBOXMAINEXE_LIBS.x86           = \
    62716273        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.x86)_LIB)/vcruntime$(VBOX_VCC_CRT_TYPE).lib \
    … …  
    68366838  # Note! No use of VBOX_VCC_CRT_TYPE here yet as it requires a /MDd build of Qt as well.
    68376839  TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL)
    6838   if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     6840  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    68396841   TEMPLATE_VBOXQTGUIEXE_SDKS = WINSDK10-UCRT
    68406842  endif
    … …  
    68566858   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += -wd4619
    68576859  endif
    6858   if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     6860  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    68596861   #   -wd4774: string(530): warning C4774: '_scprintf' : format string expected in argument 1 is not a string literal
    68606862   #   -wd4456: UICommon.cpp(1471): warning C4456: declaration of '_container_' hides previous local declaration  [nested foreach]
    … …  
    68796881  endif
    68806882  TEMPLATE_VBOXQTGUIEXE_SDKS += $(VBOX_WINPSDK)
    6881   if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     6883  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    68826884   TEMPLATE_VBOXQTGUIEXE_LIBS = \
    68836885        $(VBOX_LIBS_QT) \
    … …  
    71067108ifeq ($(KBUILD_HOST),win)
    71077109 TEMPLATE_VBoxBldProg_TOOL              := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_HOST_ARCH))
    7108  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     7110 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    71097111  TEMPLATE_VBoxBldProg_SDKS             := ReorderCompilerIncs WINSDK10-UCRT-STATIC $(VBOX_WINPSDK)
    71107112 else
    … …  
    71447146        /DISALLOWLIB:ucrt.lib \
    71457147        /DISALLOWLIB:ucrtd.lib
    7146  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     7148 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    71477149  TEMPLATE_VBoxBldProg_LIBS               = \
    71487150        $(PATH_TOOL_$(TEMPLATE_VBoxBldProg_TOOL)_LIB)/libvcruntime$(VBOX_VCC_CRT_TYPE).lib \
    … …  
    73487350ifeq ($(KBUILD_TARGET),win)
    73497351 TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE
    7350  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     7352 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    73517353  TEMPLATE_VBOXGUESTR3EXE_SDKS     = ReorderCompilerIncs WINSDK10-UCRT-STATIC $(VBOX_WINPSDK_GST) VBOX_NTDLL
    73527354 else
    … …  
    73657367        /DISALLOWLIB:vcruntime$(VBOX_VCC_CRT_TYPE).lib \
    73667368        /DISALLOWLIB:ucrt$(VBOX_VCC_CRT_TYPE).lib
    7367  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     7369 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    73687370  TEMPLATE_VBOXGUESTR3EXE_LIBS.x86           = \
    73697371        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.x86)_LIB)/libvcruntime$(VBOX_VCC_CRT_TYPE).lib \

  • trunk/src/VBox/Additions/3D/win/VBoxGL/Makefile.kmk

    r83832 r84411  
    2828# -wd4005: '__useHeader' : redefinition
    2929VBoxGL_CFLAGS  := -wd4005
    30 if "$(VBOX_NEWER_VCC_TOOL_STEM)" >= "VCC141"
     30if "$(VBOX_NEWER_VCC_TOOL_STEM)" >= "VCC140"
    3131# -wd4204: nonstandard extension used: non-constant aggregate initializer
    3232# -wd4459: stw_device.h(102): warning C4459: declaration of 'stw_dev' hides global declaration

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

    r83941 r84411  
    14821482 TEMPLATE_VBoxSVGA3D_EXTENDS := $(if-expr "$(KBUILD_TARGET)" == "darwin" && !defined(VBOX_WITH_NEW_XCODE),VBoxR3DllOsX107,VBOXR3)
    14831483 TEMPLATE_VBoxSVGA3D_CFLAGS      = $(filter-out -pedantic -Wstrict-prototypes,$(TEMPLATE_$(TEMPLATE_VBoxSVGA3D_EXTENDS)_CFLAGS))
    1484  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     1484 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    14851485  # -wd4777: glsl_shader.c(1542): warning C4777: 'sprintf' : format string '%u' requires an argument of type 'unsigned int', but variadic argument 2 has type 'DWORD'
    14861486  TEMPLATE_VBoxSVGA3D_CFLAGS.win = $(TEMPLATE_$(TEMPLATE_VBoxSVGA3D_EXTENDS)_CFLAGS.win) \

  • trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

    r83810 r84411  
    6565 TEMPLATE_VBoxR3ExtPackDTrace_INST = $(INST_EXTPACK_VBOXDTRACE)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
    6666 TEMPLATE_VBoxR3ExtPackDTrace_DEFS = $(TEMPLATE_VBoxR3ExtPack_DEFS) VBOX_IN_DTRACE_EXTPACK
    67  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     67 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    6868  # -wd4456: declaration of 'rval' hides previous local declaration
    6969  # -wd4477: 'fprintf' : format string '%02lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'ulong_t'

  • trunk/src/VBox/Main/include/SessionImpl.h

    r83788 r84411  
    2929#endif
    3030
    31 #if defined(RT_OS_WINDOWS) && !RT_MSC_PREREQ(RT_MSC_VER_VC141)
     31#if defined(RT_OS_WINDOWS) && !RT_MSC_PREREQ(RT_MSC_VER_VC140)
    3232[threading(free)]
    3333#endif

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

    r83889 r84411  
    216216TEMPLATE_VBOXWEBR3EXE_CXXFLAGS += $(VBOX_GCC_Wno-misleading-indentation)
    217217endif
    218 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     218if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    219219 # -wd4774: string(532): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal
    220220 # -wd4458: stdsoap2.h(2644): warning C4458: declaration of 'type' hides class member
    … …  
    339339    $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS.win += -wd4756 # v2.8.36/stdsoap2.cpp(14008) : warning C4756: overflow in constant arithmetic
    340340   endif
    341    if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     341   if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    342342    $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS.win += -wd4456 # stdsoap2.cpp(3127): warning C4456: declaration of 'i' hides previous local declaration
    343343   endif
    … …  
    386386        .
    387387 vboxwebsrv_CXXFLAGS.win += -bigobj
    388  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     388 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    389389  vboxwebsrv_CXXFLAGS.win += -wd4774 # string(532): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal
    390390  vboxwebsrv_CXXFLAGS.win += -wd4458 # stdsoap2.h(2644): warning C4458: declaration of 'type' hides class member

  • trunk/src/libs/libxml2-2.9.4/Makefile.kmk

    r83765 r84411  
    3737 VBox-libxml2_CFLAGS.win   += -wd4005 # sdk\v7.1\include\sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition
    3838endif
    39 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
     39if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    4040 VBox-libxml2_CFLAGS.win   += -wd4777 # timsort.h(326): warning C4777: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'unsigned int'
    4141 VBox-libxml2_CFLAGS.win   += -wd4477 # timsort.h(326): warning C4477: 'fprintf' : format string '%lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'size_t'
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