Changeset 95121 in vbox
- Timestamp:
- May 25, 2022 9:12:06 PM (3 years ago)
- File:
-
- 1 edited
-
trunk/Config.kmk (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r95063 r95121 3419 3419 endif 3420 3420 endif 3421 ifndef VBOX_VCC_std 3422 if $(VBOX_VCC_TOOL_STEM) >= VCC141 # since 2017 15.3 3423 if 0 # not yet enabled 3424 VBOX_VCC_std := -std:c++17 -Zc:__cplusplus 3425 endif 3426 endif 3427 endif 3421 3428 3422 3429 … … 3507 3514 # -wd4435: iprt/cpp/xml.h(185) : warning C4435: 'xml::Input' : Object layout under /vd2 will change due to virtual base 'xml::Stream' 3508 3515 VBOX_VCC_WARN_ALL += -wd4350 -wd4435 3509 VBOX_VCC120_WARN_ALL := $(VBOX_VCC_WARN_ALL)3510 3516 endif 3511 3517 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140" … … 3519 3525 # -wd5027: 'SUPDRVTRACERDATA': move assignment operator was implicitly defined as deleted 3520 3526 # -wd4435: 'xml::Input': Object layout under /vd2 will change due to virtual base 'xml::Stream' 3521 VBOX_VCC_WARN_ALL += -wd5045 -wd4464 -wd4623 -wd4625 -wd4626 -wd5026 -wd5027 -wd4435 3527 # -wd4577: 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed. Specify /EHsc 3528 VBOX_VCC_WARN_ALL += -wd5045 -wd4464 -wd4623 -wd4625 -wd4626 -wd5026 -wd5027 -wd4435 -wd4577 3522 3529 endif 3523 3530 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142" # With v16.11.9, not with v16.6.0 4242 … … 5174 5181 TEMPLATE_VBoxR0_RCDEFS = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000) 5175 5182 TEMPLATE_VBoxR0_CXXFLAGS = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) \ 5176 -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_ WARN_ALL) -wd4505 $(VBOX_VCC_WERR)5183 -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_std) $(VBOX_VCC_WARN_ALL) -wd4505 $(VBOX_VCC_WERR) 5177 5184 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120" 5178 5185 TEMPLATE_VBoxR0_CXXFLAGS += -Gw … … 5181 5188 TEMPLATE_VBoxR0_CXXFLAGS += /analyze 5182 5189 endif 5183 TEMPLATE_VBoxR0_CFLAGS = $( TEMPLATE_VBoxR0_CXXFLAGS)5190 TEMPLATE_VBoxR0_CFLAGS = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBoxR0_CXXFLAGS)) 5184 5191 TEMPLATE_VBoxR0_LDFLAGS = -Ignore:4197 \ 5185 5192 -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) \ … … 5920 5927 endif 5921 5928 TEMPLATE_VBOXR3EXE_CXXFLAGS = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) \ 5922 -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) $(VBOX_VCC_ WARN_ALL) $(VBOX_VCC_WERR)5929 -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) $(VBOX_VCC_std) $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR) 5923 5930 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120" 5924 5931 TEMPLATE_VBOXR3EXE_CXXFLAGS += -Gw … … 5930 5937 TEMPLATE_VBOXR3EXE_CXXFLAGS.dbgopt = $(NO_SUCH_VARIABLE) 5931 5938 TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile = -Gh -GH 5932 TEMPLATE_VBOXR3EXE_CFLAGS = $( TEMPLATE_VBOXR3EXE_CXXFLAGS)5939 TEMPLATE_VBOXR3EXE_CFLAGS = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) 5933 5940 TEMPLATE_VBOXR3EXE_CFLAGS.debug = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug) 5934 5941 TEMPLATE_VBOXR3EXE_CFLAGS.dbgopt = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.dbgopt) … … 7026 7033 endif 7027 7034 TEMPLATE_VBOXMAINEXE_CXXFLAGS = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -Zc:wchar_t- \ 7028 $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) 7035 $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) $(VBOX_VCC_std) 7029 7036 # -wd4625: 'DisplaySourceBitmap' : copy constructor could not be generated because a base class copy constructor is inaccessible 7030 7037 # -wd4626: 'DisplaySourceBitmap' : assignment operator could not be generated because a base class assignment operator is inaccessible … … 7042 7049 TEMPLATE_VBOXMAINEXE_CXXFLAGS.dbgopt = $(NO_SUCH_VARIABLE) 7043 7050 TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile = -Gh -GH 7044 TEMPLATE_VBOXMAINEXE_CFLAGS = $( TEMPLATE_VBOXMAINEXE_CXXFLAGS)7051 TEMPLATE_VBOXMAINEXE_CFLAGS = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBOXMAINEXE_CXXFLAGS)) 7045 7052 TEMPLATE_VBOXMAINEXE_CFLAGS.debug = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug) 7046 7053 TEMPLATE_VBOXMAINEXE_CFLAGS.dbgopt = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.dbgopt) … … 7696 7703 QT_DLL _CRT_SECURE_NO_DEPRECATE \ 7697 7704 $(QMAKE_PRL_DEFINES) 7698 TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = -nologo -Zm200 -MD -Zi -EHsc -Zc:wchar_t- $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) 7705 TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = -nologo -Zm200 -MD -Zi -EHsc -Zc:wchar_t- $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) $(VBOX_VCC_std) 7699 7706 # -wd4481: nonstandard extension used: override specifier 'override' 7700 7707 # -wd4625: 'QRubberBand' : copy constructor could not be generated because a base class copy constructor is inaccessible … … 7717 7724 # -wd4946: qmap.h(213): warning C4946: reinterpret_cast used between related classes: 'QMapNodeBase' and 'QMapNode<Key,T>' 7718 7725 TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += -wd4774 -wd4456 -wd4458 -wd4946 7726 endif 7727 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141" 7728 # -wd4866: UIVirtualBoxManager.cpp(221) : warning C4866: compiler may not enforce left-to-right evaluation order for call to 'QStringList::operator<<' 7729 # Only with -std=c++17 and later. 7730 TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += -wd4866 7719 7731 endif 7720 7732 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142" # With v16.11.9, not with v16.6.0 4242 … … 8030 8042 endif 8031 8043 TEMPLATE_VBoxBldProg_CXXFLAGS := -Zi -Zl -GR- -EHsc -GF -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) \ 8032 -MT$(VBOX_VCC_CRT_TYPE) -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_ WARN_ALL) $(VBOX_VCC_WERR)8044 -MT$(VBOX_VCC_CRT_TYPE) -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_std) $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR) 8033 8045 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120" 8034 8046 TEMPLATE_VBoxBldProg_CXXFLAGS += -Gw … … 8041 8053 TEMPLATE_VBoxBldProg_CXXFLAGS.profile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release) 8042 8054 TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release) 8043 TEMPLATE_VBoxBldProg_CFLAGS = $( TEMPLATE_VBoxBldProg_CXXFLAGS)8055 TEMPLATE_VBoxBldProg_CFLAGS = $(filter-out $(VBOX_VCC_std),$(TEMPLATE_VBoxBldProg_CXXFLAGS)) 8044 8056 TEMPLATE_VBoxBldProg_CFLAGS.debug = $(TEMPLATE_VBoxBldProg_CXXFLAGS.debug) 8045 8057 TEMPLATE_VBoxBldProg_CFLAGS.dbgopt = $(TEMPLATE_VBoxBldProg_CXXFLAGS.dbgopt)
Note:
See TracChangeset
for help on using the changeset viewer.
