Changeset 93385 in vbox for trunk

Timestamp:

Jan 20, 2022 8:30:39 PM (3 years ago)

Author:

vboxsync

Message:

Additions: make VBoxDRMClient and VBoxClient --vmsvga-session available only from Linux, bugref:10185.

For the rest of platforms (Solaris, FreeBSD) --vmsvga-session is an alias to --vmsvga.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxClient.h (modified) (1 diff)
• main.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -34 +34 @@
 # if you rename the following program name.
 #
-PROGRAMS += VBoxDRMClient
+PROGRAMS.linux += VBoxDRMClient
 
 VBoxClient_TEMPLATE = NewVBoxGuestR3Exe
@@ -126 +126 @@
  VBoxClient_DEFS    += VBOX_WITH_VMSVGA
  VBoxClient_SOURCES += \
-        display-svga-x11.cpp \
+        display-svga-x11.cpp
+ VBoxClient_SOURCES.linux += \
         display-svga-session.cpp \
         display-ipc.cpp \

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -108 +108 @@
 extern VBCLSERVICE g_SvcDisplayDRM;
 extern VBCLSERVICE g_SvcDisplaySVGA;
+# ifdef RT_OS_LINUX
 extern VBCLSERVICE g_SvcDisplaySVGASession;
+# endif
 extern VBCLSERVICE g_SvcDragAndDrop;
 extern VBCLSERVICE g_SvcHostVersion;

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -277 +277 @@
 #ifdef VBOX_WITH_VMSVGA
     RTPrintf("  --vmsvga             starts VMSVGA dynamic resizing for X11/Wayland guests\n");
+#ifdef RT_OS_LINUX
     RTPrintf("  --vmsvga-session     starts Desktop Environment specific screen assistant for X11/Wayland guests\n"
              "                       (VMSVGA graphics adapter only)\n");
+#else
+    RTPrintf("  --vmsvga-session     an alias for --vmsvga\n");
+#endif
 #endif
     RTPrintf("  -f, --foreground     run in the foreground (no daemonizing)\n");
@@ -489 +493 @@
                 break;
             }
+
             case VBOXCLIENT_OPT_VMSVGA_SESSION:
             {
                 if (g_Service.pDesc)
                     return vbclSyntaxOnlyOneService();
+# ifdef RT_OS_LINUX
                 g_Service.pDesc = &g_SvcDisplaySVGASession;
+# else
+                g_Service.pDesc = &g_SvcDisplaySVGA;
+# endif
                 break;
             }