VirtualBox

Changeset 66833 in vbox for trunk


Ignore:
Timestamp:
May 8, 2017 4:59:59 PM (7 years ago)
Author:
vboxsync
Message:

Config.kmk: Adjustments for Visual C++ v12 / Visual Studio 2013. New warnings.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r66774 r66833  
    13371337ifdef VBOX_USE_KSUBMIT
    13381338 ifeq ($(KBUILD_HOST),win)
     1339  #TOOL_VCC120AMD64_USE_KSUBMIT := 1
     1340  #TOOL_VCC120X86_USE_KSUBMIT   := 1
    13391341  TOOL_VCC100AMD64_USE_KSUBMIT := 1
    13401342  TOOL_VCC100X86_USE_KSUBMIT   := 1
     
    15151517ifndef VBOX_VCC_TOOL_STEM
    15161518 VBOX_VCC_TOOL_STEM := VCC100
    1517 else ifn1of ($(VBOX_VCC_TOOL_STEM), VCC100 VCC110)
     1519else ifn1of ($(VBOX_VCC_TOOL_STEM), VCC100 VCC110 VCC120)
    15181520 $(error VBox: VBOX_VCC_TOOL_STEM='$(VBOX_VCC_TOOL_STEM)' is not supported, only VCC100 and VCC110 is)
    15191521endif
     
    16181620# Decide which Windows DDK to use by default.
    16191621#
    1620 ifeq ($(VBOX_VCC_TOOL_STEM),VCC110)
     1622if1of ($(VBOX_VCC_TOOL_STEM), VCC110)
    16211623 VBOX_WINDDK         ?= WINDDK80
    16221624else
     
    16441646# Decide which Windows SDK to use by default.
    16451647#
    1646 ifeq ($(VBOX_VCC_TOOL_STEM),VCC110)
     1648if1of ($(VBOX_VCC_TOOL_STEM), VCC110)
    16471649 VBOX_WINPSDK ?= WINPSDK80
    16481650else
     
    28572859        -wd4514 -wd4820 -wd4365 -wd4987 -wd4710 -wd4061 -wd4986 -wd4191 -wd4574 -wd4917 -wd4711 -wd4611 -wd4571 -wd4324 -wd4505 \
    28582860        -wd4263 -wd4264 -wd4738 -wd4200
     2861if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
     2862 #    -wd4350: behavior change: 'std::_Wrap_alloc<std::allocator<char>>::_Wrap_alloc(const std::_Wrap_alloc<std::allocator<char>> &) throw()' called instead of 'std::_Wrap_alloc<std::allocator<char>>::_Wrap_alloc<std::_Wrap_alloc<std::allocator<char>>>(_Other &) throw()'
     2863 #    -wd4435: iprt/cpp/xml.h(185) : warning C4435: 'xml::Input' : Object layout under /vd2 will change due to virtual base 'xml::Stream'
     2864 VBOX_VCC_WARN_ALL += -wd4350 -wd4435
     2865endif
     2866
    28592867#ifndef VBOX_WITH_MASOCHISTIC_WARNINGS
    28602868# VBOX_VCC_WARN_ALL +=
     
    59165924  #    -wd4718: qmap.h(222) : warning C4718: 'QMapNode<enum DetailsElementType,bool>::destroySubTree' : recursive call has no side effects, deleting
    59175925  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += $(VBOX_VCC_WARN_ALL) -wd4481 -wd4625 -wd4626 -wd4640 -wd4350 -wd4371 -wd4121 -wd4718 $(VBOX_VCC_WERR)
     5926  if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
     5927   #   -wd4619: qvectro.h(305 : warning C4619: #pragma warning : there is no warning number '4345'
     5928   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += -wd4619
     5929  endif
    59185930  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.debug = -RTCsu
    59195931  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.dbgopt = $(NO_SUCH_VARIABLE)
     
    64206432 TEMPLATE_VBoxGuestR3Exe_CFLAGS      += $(VBOX_VCC_WERR)
    64216433 TEMPLATE_VBoxGuestR3Exe_CXXFLAGS    += $(VBOX_VCC_WERR)
     6434 if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
     6435  # VBoxDrvInst.cpp(520) : warning C4313: 'wprintf'  : '%d' in format string conflicts with argument 1 of type 'const TCHAR *' [false positive - buggy compiler?]
     6436  TEMPLATE_VBoxGuestR3Exe_CXXFLAGS   += -wd4313
     6437 endif
    64226438 TEMPLATE_VBoxGuestR3Exe_LDFLAGS     += $(VBOX_VCC_LD_WERR)
    64236439else ifndef VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE
     
    66486664 TEMPLATE_VBOXCROGLR3HOSTDLL_CXXFLAGS        = $(TEMPLATE_VBOXR3NP_CXXFLAGS) -Wno-deprecated-declarations
    66496665 TEMPLATE_VBOXCROGLR3HOSTDLL_OBJCFLAGS       = $(TEMPLATE_VBOXR3NP_OBJCFLAGS) -Wno-deprecated-declarations
     6666else ifeq ($(KBUILD_TARGET),win)
     6667 if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
     6668  #   -wd4255: cr_spu.h(146) : warning C4255: 'wglGetCurrentContextFunc_t' : no function prototype given: converting '()' to '(void)'
     6669  #   -wd4296: udptcpip.c(662) : warning C4296: '>=' : expression is always true
     6670  #   -wd4245: udptcpip.c(174) : warning C4245: '=' : conversion from 'int' to 'CRSocket', signed/unsigned mismatch
     6671  #   -wd4668: tcpip.c(961) : warning C4668: 'CRAPPFAKER_SHOULD_DIE' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
     6672  #   -wd4005: v7.1\include\sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition
     6673  #   -wd4057: state_lists.c(196) : warning C4057: 'function' : 'GLint *' differs in indirection to slightly different base types from 'GLenum *'
     6674  #   -wd4389: renderspu.c(750) : warning C4389: '!=' : signed/unsigned mismatch
     6675  #   -wd4054: renderspu_wgl.c(281) : warning C4054: 'type cast' : from function pointer 'HWND (__cdecl *)()' to data pointer 'void *'
     6676  #   -wd4055: renderspu.c(1553) : warning C4055: 'type cast' : from data pointer 'const GLvoid *' to function pointer 'PFNVCRSERVER_CLIENT_CALLOUT'
     6677  #   -wd4312: renderspu_wgl.c(1420) : warning C4312: 'type cast' : conversion from 'GLint' to 'HDC' of greater size [TODO: check this one out]
     6678  #   -wd4189: server_config.c(111) : warning C4189: 'my_rank' : local variable is initialized but not referenced
     6679  #   -wd4100: vboxhgcm.c(1365) : warning C4100: 'conn' : unreferenced formal parameter
     6680  TEMPLATE_VBOXCROGLR3HOSTDLL_CFLAGS         = $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS)_CFLAGS) \
     6681        -wd4255 -wd4296 -wd4245 -wd4668 -wd4005 -wd4057 -wd4389 -wd4054 -wd4055 -wd4312 -wd4189 -wd4100
     6682  TEMPLATE_VBOXCROGLR3HOSTDLL_CXXFLAGS       = $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS)_CXXFLAGS) \
     6683        -wd4245 -wd4389 -wd4189 -wd4100
     6684 endif
     6685
    66506686endif
    66516687
     
    66746710TEMPLATE_VBOXCROGLR3GUESTDLL_INCS             = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES) $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS)_INCS)
    66756711TEMPLATE_VBOXCROGLR3GUESTDLL_SDKS.darwin      = DARWIN-OPENGL $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS)_SDKS)
    6676 ifneq ($(KBUILD_TARGET),win)
     6712ifeq ($(KBUILD_TARGET),win)
     6713 if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
     6714  #   -wd4255: cr_spu.h(146) : warning C4255: 'wglGetCurrentContextFunc_t' : no function prototype given: converting '()' to '(void)'
     6715  #   -wd4296: udptcpip.c(662) : warning C4296: '>=' : expression is always true
     6716  #   -wd4245: udptcpip.c(174) : warning C4245: '=' : conversion from 'int' to 'CRSocket', signed/unsigned mismatch
     6717  #   -wd4668: tcpip.c(961) : warning C4668: 'CRAPPFAKER_SHOULD_DIE' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
     6718  #   -wd4005: v7.1\include\sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition
     6719  #   -wd4057: state_lists.c(196) : warning C4057: 'function' : 'GLint *' differs in indirection to slightly different base types from 'GLenum *'
     6720  #   -wd4311: wgl.c(183) : warning C4311: 'type cast' : pointer truncation from 'HGLRC' to 'unsigned long' [TODO: fix source code]
     6721  #   -wd4312: wgl.c(218) : warning C4312: 'type cast' : conversion from 'unsigned long' to 'HGLRC' of greater size [TODO: fix source code]
     6722  #   -wd4054: feedbackspu.c(530) : warning C4054: 'type cast' : from function pointer 'SPUGenericFunction' to data pointer 'void *'
     6723  #   -wd4189: load.c(1273) : warning C4189: 'pContextRecord' : local variable is initialized but not referenced
     6724  #   -wd4100: vboxhgcm.c(1365) : warning C4100: 'conn' : unreferenced formal parameter
     6725  TEMPLATE_VBOXCROGLR3GUESTDLL_CFLAGS         = $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS)_CFLAGS) \
     6726        -wd4255 -wd4296 -wd4245 -wd4668 -wd4005 -wd4057 -wd4311 -wd4312 -wd4054 -wd4189 -wd4100
     6727 endif
     6728else
    66776729 TEMPLATE_VBOXCROGLR3GUESTDLL_CFLAGS          = $(filter-out -pedantic, $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS)_CFLAGS)) \
    66786730        $(if-expr !defined(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),$(VBOX_GCC_Wno-overlength-strings),)
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