- Timestamp:
- May 12, 2017 2:51:25 PM (7 years ago)
- File:
-
- 1 edited
-
trunk/Config.kmk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r66873 r66881 1524 1524 endif 1525 1525 1526 1526 # 1527 # Decide which Visual C++ compiler version we're using for newer stuff. 1528 # 1529 ifndef VBOX_NEWER_VCC_TOOL_STEM 1530 VBOX_NEWER_VCC_TOOL_STEM := VCC120 1531 else ifn1of ($(VBOX_NEWER_VCC_TOOL_STEM), VCC120) 1532 $(error VBox: VBOX_NEWER_VCC_TOOL_STEM='$(VBOX_NEWER_VCC_TOOL_STEM)' is not supported, only VCC120 is) 1533 endif 1534 ifndef VBOX_NEWER_VCC_TOOL 1535 VBOX_NEWER_VCC_TOOL := $(VBOX_NEWER_VCC_TOOL_STEM)$(toupper $(KBUILD_TARGET_ARCH)) 1536 endif 1537 1538 # 1539 # Default too nonsense. 1540 # 1527 1541 ## @todo Remove the default tool crap here! 1528 1542 TOOL = $(VBOX_GCC_TOOL) … … 2863 2877 # -wd4435: iprt/cpp/xml.h(185) : warning C4435: 'xml::Input' : Object layout under /vd2 will change due to virtual base 'xml::Stream' 2864 2878 VBOX_VCC_WARN_ALL += -wd4350 -wd4435 2865 endif 2866 2867 #ifndef VBOX_WITH_MASOCHISTIC_WARNINGS 2868 # VBOX_VCC_WARN_ALL += 2869 #endif 2879 VBOX_VCC120_WARN_ALL ?= $(VBOX_VCC_WARN_ALL) 2880 endif 2870 2881 VBOX_VCC_WARN_ALL += -wd4242 -wd4244 2882 ifndef VBOX_NEWER_VCC_WARN_ALL 2883 if "$(VBOX_VCC_TOOL_STEM)" < "VCC120" 2884 VBOX_NEWER_VCC_WARN_ALL := $(VBOX_VCC_WARN_ALL) -wd4350 -wd4435 2885 else 2886 VBOX_NEWER_VCC_WARN_ALL := $(VBOX_VCC_WARN_ALL) 2887 endif 2888 endif 2889 2871 2890 2872 2891 # Disable pedantic warnings for NP/NonPedantic templates. … … 2888 2907 VBOX_VCC_NON_PEDANTIC = -wd4131 -wd4255 -wd4668 -wd4100 -wd4189 -wd4132 -wd4152 -wd4702 -wd4057 -wd4296 -wd4389 -wd4018 -wd4245 \ 2889 2908 -wd4267 -wd4295 2909 VBOX_NEWER_VCC_NON_PEDANTIC = $(VBOX_VCC_NON_PEDANTIC) 2890 2910 2891 2911 ifeq ($(KBUILD_TARGET),win) … … 6483 6503 6484 6504 # 6505 # Template for building normal R3 (dynamic) libraries for the guest additions with Visual C++ 2013 or later, strict. 6506 # 6507 TEMPLATE_NewerVccVBoxGuestR3Dll = VBoxGuestR3Dll with the newer Visual C++ version (2013 or later). 6508 TEMPLATE_NewerVccVBoxGuestR3Dll_EXTENDS = VBoxGuestR3Dll 6509 ifeq ($(KBUILD_TARGET),win) 6510 TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86 = $(VBOX_NEWER_VCC_TOOL_STEM)X86 6511 TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64 = $(VBOX_NEWER_VCC_TOOL_STEM)AMD64 6512 TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS = \ 6513 $(filter-out $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR), $(TEMPLATE_VBoxGuestR3Dll_CXXFLAGS)) \ 6514 $(VBOX_NEWER_VCC_WARN_ALL) $(VBOX_VCC_WERR) 6515 TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS = $(TEMPLATE_NewerVccVBoxGuestR3Dll_CXXFLAGS) 6516 TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86 = \ 6517 $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3Dll_TOOL.win.x86)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.x86)_LIB), $(TEMPLATE_VBoxGuestR3Dll_LIBS.x86)) 6518 TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.amd64 = \ 6519 $(subst $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3Dll_TOOL.win.amd64)_LIB),$(PATH_TOOL_$(TEMPLATE_NewerVccVBoxGuestR3Dll_TOOL.win.amd64)_LIB), $(TEMPLATE_VBoxGuestR3Dll_LIBS.amd64)) 6520 endif 6521 6522 # 6485 6523 # Template for building R3 (static) libraries for the guest additions, allows warnings. 6486 6524 #
Note:
See TracChangeset
for help on using the changeset viewer.

