Changeset 86037 in vbox for trunk

Timestamp:

Sep 7, 2020 11:12:00 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140247

Message:

Devices/Graphics: use current VMSVGA headers (GCC 4 tweaks)

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -290 +290 @@
   VBoxDD_INCS           += $(VBOX_PATH_VMSVGA_INC)
   VBoxDD_SOURCES        += Graphics/DevVGA-SVGA.cpp
+  ifneq ($(KBUILD_TARGET),win)
+   if $(VBOX_GCC_VERSION_CXX) < 40600
+    # Disable "ISO C++ prohibits anonymous structs [-Werror=pedantic]" caused by Mesa VMSVGA driver headers
+    # For GCC >= 4.6.0 the warning is disabled in DevVGA_SVGA.h
+    Graphics/DevVGA.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA-SVGA.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA_VBVA.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA_VDMA.cpp_CXXFLAGS = -Wno-pedantic
+   endif
+  endif
  endif
  ifdef VBOX_WITH_VMSVGA3D
@@ -353 +363 @@
   else if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.14 10.15 10.16 11.0)
    Graphics/DevVGA-SVGA3d-ogl.cpp_CXXFLAGS.darwin        = $(VBOX_GCC_Wno-deprecated-declarations)
+  endif
+  ifneq ($(KBUILD_TARGET),win)
+   if $(VBOX_GCC_VERSION_CXX) < 40600
+    # Disable "ISO C++ prohibits anonymous structs [-Werror=pedantic]" caused by Mesa VMSVGA driver headers
+    # For GCC >= 4.6.0 the warning is disabled in DevVGA_SVGA.h
+    Graphics/DevVGA-SVGA3d.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA-SVGA3d-glHlp.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA-SVGA3d-hlp.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA-SVGA3d-info.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA-SVGA3d-ogl.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA-SVGA3d-savedstate.cpp_CXXFLAGS = -Wno-pedantic
+    Graphics/DevVGA-SVGA3d-shared.cpp_CXXFLAGS = -Wno-pedantic
+   endif
   endif
  endif

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

@@ -95 +95 @@
         $(VBOX_PATH_VMSVGA_INC)
 tstDeviceStructSize_SOURCES  = tstDeviceStructSize.cpp
+ifneq ($(KBUILD_TARGET),win)
+ if $(VBOX_GCC_VERSION_CXX) < 40600
+  # Disable "ISO C++ prohibits anonymous structs [-Werror=pedantic]" caused by Mesa VMSVGA driver headers
+  # For GCC >= 4.6.0 the warning is disabled in DevVGA_SVGA.h
+tstDeviceStructSize.cpp_CXXFLAGS = -Wno-pedantic
+ endif
+endif
 tstDeviceStructSize_CLEAN    = \
         $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h \