Changeset 63110 in vbox

Timestamp:

Aug 6, 2016 8:29:59 PM (8 years ago)

Author:

vboxsync

Message:

Config.kmk,zlib/Makefile.kmk: Non-pedantic MSC and such.

Location:

trunk

Files:

• Config.kmk (modified) (6 diffs)
• src/libs/zlib-1.2.8/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -1588 +1588 @@
 VBOX_GCC_PEDANTIC_CXX ?= -pedantic $(VBOX_GCC_WARN_PEDANTIC) $(VBOX_GCC_Wno-return-type-c-linkage)
 VBOX_GCC_PEDANTIC_C   ?= -pedantic $(VBOX_GCC_WARN_PEDANTIC) -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Werror-implicit-function-declaration
+
+VBOX_GCC_NON_PEDANTIC_CXX ?= -Wno-sign-compare
+VBOX_GCC_NON_PEDANTIC_C   ?= -Wno-sign-compare -Werror-implicit-function-declaration
+
 
 # Disabled Visual C++ warnings, W4:
@@ -1634 +1638 @@
 endif
 VBOX_VCC_WARN_ALL += -wd4242 -wd4244
+
+# Disable pedantic warnings for NP/NonPedantic templates.
+#      -wd4131: 'bi_flush' : uses old-style declarator
+#      -wd4255: 'tr_static_init' : no function prototype given: converting '()' to '(void)'
+VBOX_VCC_NON_PEDANTIC = -wd4131 -wd4255
 
 ifeq ($(KBUILD_TARGET),win)
@@ -4655 +4664 @@
 endif
 
+#
+# Non-pedantic variation of VBoxR3Static
+#
+TEMPLATE_VBoxR3StaticNonPedantic            = VBox Static Ring-3 EXE, non-pedantic.
+TEMPLATE_VBoxR3StaticNonPedantic_EXTENDS   = VBoxR3Static
+ifeq ($(KBUILD_TARGET),win)
+ TEMPLATE_VBoxR3StaticNonPedantic_CXXFLAGS = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBOXR3_CXXFLAGS)) $(VBOX_VCC_NON_PEDANTIC)
+ TEMPLATE_VBoxR3StaticNonPedantic_CFLAGS   = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBOXR3_CFLAGS))   $(VBOX_VCC_NON_PEDANTIC)
+else # gcc:
+ TEMPLATE_VBoxR3StaticNonPedantic_TOOL     = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR3StaticNonPedantic_CXXFLAGS = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBOXR3_CXXFLAGS)) \
+        $(VBOX_GCC_NON_PEDANTIC_CXX)
+ TEMPLATE_VBoxR3StaticNonPedantic_CFLAGS   = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_C)  ,$(TEMPLATE_VBOXR3_CFLAGS)) \
+        $(VBOX_GCC_NON_PEDANTIC_CXX)
+endif
+
 
 #
@@ -4919 +4944 @@
  TEMPLATE_VBOXR3NPEXE_TOOL               = $(VBOX_GCC_TOOL)
  TEMPLATE_VBOXR3NPEXE_CXXFLAGS           = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) \
-        -Wno-sign-compare
+        $(VBOX_GCC_NON_PEDANTIC_CXX)
  TEMPLATE_VBOXR3NPEXE_CFLAGS             = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_C)  ,$(TEMPLATE_VBOXR3EXE_CFLAGS)) \
-        -Wno-sign-compare -Werror-implicit-function-declaration
+        $(VBOX_GCC_NON_PEDANTIC_C)
 endif
 
@@ -4936 +4961 @@
  TEMPLATE_VBOXR3NP_TOOL                  = $(VBOX_GCC_TOOL)
  TEMPLATE_VBOXR3NP_CXXFLAGS              = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBOXR3_CXXFLAGS)) \
-        -Wno-sign-compare
+        $(VBOX_GCC_NON_PEDANTIC_CXX)
  TEMPLATE_VBOXR3NP_CFLAGS                = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_C)  ,$(TEMPLATE_VBOXR3_CFLAGS)) \
-        -Wno-sign-compare -Werror-implicit-function-declaration
+        $(VBOX_GCC_NON_PEDANTIC_C)
  TEMPLATE_VBOXR3NP_OBJCFLAGS             = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) -pedantic -Wstrict-prototypes,$(TEMPLATE_VBOXR3_OBJCFLAGS))
  TEMPLATE_VBOXR3NP_OBJCXXFLAGS           = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) -pedantic,$(TEMPLATE_VBOXR3_OBJCXXFLAGS))
@@ -4950 +4975 @@
 TEMPLATE_VBoxR3DllNonPedantic               = VBox ring-3 Non-pedantic, with warnings.
 TEMPLATE_VBoxR3DllNonPedantic_EXTENDS       = VBOXR3
-ifneq ($(KBUILD_TARGET),win) # (only gcc)
+ifeq ($(KBUILD_TARGET),win)
+ TEMPLATE_VBoxR3DllNonPedantic_CXXFLAGS     = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBOXR3_CXXFLAGS)) $(VBOX_VCC_NON_PEDANTIC)
+ TEMPLATE_VBoxR3DllNonPedantic_CFLAGS       = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBOXR3_CFLAGS))   $(VBOX_VCC_NON_PEDANTIC)
+else # gcc:
  TEMPLATE_VBoxR3DllNonPedantic_TOOL         = $(VBOX_GCC_TOOL)
  TEMPLATE_VBoxR3DllNonPedantic_CXXFLAGS     = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBOXR3_CXXFLAGS)) \
-        -Wno-sign-compare
+        $(VBOX_GCC_NON_PEDANTIC_CXX)
  TEMPLATE_VBoxR3DllNonPedantic_CFLAGS       = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_C)  ,$(TEMPLATE_VBOXR3_CFLAGS)) \
-        -Wno-sign-compare -Werror-implicit-function-declaration
+        $(VBOX_GCC_NON_PEDANTIC_C)
 endif
 

trunk/src/libs/zlib-1.2.8/Makefile.kmk

@@ -24 +24 @@
  LIBRARIES += VBox-zlib-static
 endif
-VBox-zlib_TEMPLATE = VBoxR3RuntimeDll
+VBox-zlib_TEMPLATE = VBoxR3RuntimeDllNonPedantic
 VBox-zlib_DEFS = verbose=-1 NO_VIZ=1
 VBox-zlib_SOURCES = \
@@ -43 +43 @@
         inffast.c
 
-VBox-zlib-static_TEMPLATE = VBOXR3STATIC
+VBox-zlib-static_TEMPLATE = VBoxR3StaticNonPedantic
 VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
 VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
@@ -49 +49 @@
 ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
  LIBRARIES += VBox-zlib-x86
- VBox-zlib-x86_TEMPLATE = VBoxR3Dll-x86
+ VBox-zlib-x86_TEMPLATE = VBoxR3DllNonPedantic-x86
  VBox-zlib-x86_EXTENDS = VBox-zlib
 endif