Changeset 78162 in vbox

Timestamp:

Apr 17, 2019 2:04:17 PM (6 years ago)

Author:

vboxsync

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

130077

Message:

Shared Clipboard/Additions: Make feature optional (if VBOX_WITH_SHARED_CLIPBOARD is being set).

Location:

trunk/src/VBox/Additions

Files:

• darwin/VBoxClient/Makefile.kmk (modified) (1 diff)
• darwin/VBoxClient/VBoxClient.cpp (modified) (1 diff)
• x11/VBoxClient/Makefile.kmk (modified) (2 diffs)
• x11/VBoxClient/main.cpp (modified) (4 diffs)

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

@@ -29 +29 @@
 
 VBoxClient_SOURCES  = \
-    VBoxClient.cpp \
-    VBoxClientClipboard.cpp \
-    VBoxClientClipboardHostToGuest.cpp \
-    VBoxClientClipboardGuestToHost.cpp \
-    $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
+    VBoxClient.cpp
+
+ifdef VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_DEFS   += \
+        VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_SOURCES += \
+        VBoxClientClipboard.cpp \
+        VBoxClientClipboardHostToGuest.cpp \
+        VBoxClientClipboardGuestToHost.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp
+endif
 
 VBoxClient_LDFLAGS  = -framework IOKit -framework ApplicationServices

trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClient.cpp

@@ -45 +45 @@
 static VBOXCLIENTSERVICE    g_aServices[] =
 {
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
     g_ClipboardService
+#endif
 };
 

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

@@ -33 +33 @@
 VBoxClient_SOURCES = \
         main.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
-        clipboard.cpp \
         display-svga.cpp \
         display-svga-x11.cpp \
@@ -43 +40 @@
         hostversion.cpp \
         check3d.cpp
+
+ifdef VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_DEFS += \
+        VBOX_WITH_SHARED_CLIPBOARD
+ VBoxClient_SOURCES += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
+        clipboard.cpp
+endif
+
 VBoxClient_SOURCES.linux = \
         chk_stubs.c

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

@@ -192 +192 @@
 static void vboxClientUsage(const char *pcszFileName)
 {
-    RTPrintf("Usage: %s --clipboard|"
+    RTPrintf("Usage: %s "
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+             "--clipboard|"
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
              "--draganddrop|"
@@ -205 +208 @@
     RTPrintf("Starts the VirtualBox DRM/X Window System guest services.\n\n");
     RTPrintf("Options:\n");
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
     RTPrintf("  --clipboard        starts the shared clipboard service\n");
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
     RTPrintf("  --draganddrop      starts the drag and drop service\n");
@@ -288 +293 @@
             fRespawn = false;
         }
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
         else if (!strcmp(argv[i], "--clipboard"))
         {
@@ -294 +300 @@
             g_pService = VBClGetClipboardService();
         }
+#endif
         else if (!strcmp(argv[i], "--display"))
         {