Changeset 65381 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 20, 2017 9:23:53 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8282: Additions/linux: submit DRM driver to the Linux kernel: move all graphics device-related header files to a separate sub-directory and add that to the include path where they are needed. The intention is too be able to remove the VBox/ include folder in the DRM driver package.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• include/DisplayImpl.h (modified) (1 diff)
• src-all/DisplayUtils.cpp (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (1 diff)
• xml/VirtualBox-settings.xsd (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -331 +331 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_INCS) \
-        .
+        . \
+        $(VBOX_GRAPHICS_INCS)
 VBoxSVC_INCS.win = \
         $(VBoxCOM_0_OUTDIR)
@@ -734 +735 @@
         $(VBOX_MAIN_APIWRAPPER_INCS) \
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
-       $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace
+        $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace \
+        $(VBOX_GRAPHICS_INCS)
 VBoxC_INCS.win      = \
         $(VBoxCOM_0_OUTDIR) \

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -24 +24 @@
 #include <VBox/vmm/pdmdrv.h>
 #include <VBox/VMMDev.h>
-#include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 #include <VBox/vmm/pdmifs.h>
 #include "DisplayWrap.h"

trunk/src/VBox/Main/src-all/DisplayUtils.cpp

@@ -21 +21 @@
 #include <VBox/err.h>
 #include <VBox/vmm/ssm.h>
-#include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 
 int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData,

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -42 +42 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-# include <VBox/VBoxVideo.h>
+# include <VBoxVideo.h>
 #endif
 

trunk/src/VBox/Main/xml/VirtualBox-settings.xsd

@@ -140 +140 @@
   <xsd:restriction base="xsd:unsignedInt">
     <xsd:minInclusive value="1"/>
-    <!-- This should be in sync with VBOX_VIDEO_MAX_SCREENS in VBoxVideoVBE.h -->
+    <!-- This should be in sync with VBOX_VIDEO_MAX_SCREENS in VBoxVideo.h -->
     <xsd:maxInclusive value="64"/>
   </xsd:restriction>