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

Timestamp:

May 27, 2024 8:42:44 AM (6 months ago)

Author:

vboxsync

Message:

Main: Added a new include VBox/graphics.h to avoid dragging in a lot of other includes not needed in Main. bugref:​10693

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (3 diffs)
• src-all/PlatformPropertiesImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -211 +211 @@
 # Unconditionally enable the new semaphore key generation code
 VBOX_MAIN_DEFS += VBOX_WITH_NEW_SYS_V_KEYGEN
-
-# Main graphics include paths. Used by VBoxC and VBoxSVC.
-VBOX_MAIN_GRAPHICS_INCS = \
-        $(PATH_ROOT)/src/VBox/Devices/Graphics/ \
-        $(if $(VBOX_WITH_VMSVGA),$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include,) \
-        $(VBOX_GRAPHICS_INCS)
 
 VBOX_IDL_FILE.MSCOM    = $(VBOX_PATH_SDK)/bindings/mscom/idl/VirtualBox.idl
@@ -573 +567 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_INCS) \
-        $(VBOX_MAIN_GRAPHICS_INCS) \
         . \
+        $(VBOX_GRAPHICS_INCS)
         VBoxSVC_INCS.win = \
         $(VBoxCOM_0_OUTDIR)
@@ -1082 +1076 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace \
-        $(VBOX_MAIN_GRAPHICS_INCS)
+        $(VBOX_GRAPHICS_INCS)
  VBoxC_INCS.win     = \
         $(VBoxCOM_0_OUTDIR) \

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

@@ -32 +32 @@
 #include "Global.h"
 
-#include "VBox/vmm/pdmcritsect.h"            /* required by DevVGA.h */
-#include "VBox/param.h"                      /* Ditto. */
-#include "DevVGA.h"
-
 #include <iprt/cpp/utils.h>
 
+#include <VBox/graphics.h> /* For VRAM ranges. */
 #include <VBox/settings.h>