Changeset 102043 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Nov 9, 2023 5:16:34 PM (13 months ago)

Author:

vboxsync

Message:

Additions: X11/Wayland: Another attempt to fix build (4), bugref:10194.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (4 diffs)

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

@@ -177 +177 @@
 
 ifdef VBOX_WITH_SHARED_CLIPBOARD
+
+ ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+  SharedClipboardTransfersDefs = VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS VBOX_WITH_SHARED_CLIPBOARD_GUEST
+  SharedClipboardTransfersSources = \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
+  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
+   SharedClipboardTransfersDefs += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
+   SharedClipboardTransfersSources += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp
+  endif
+ endif
+
  VBoxClient_DEFS     += VBOX_WITH_SHARED_CLIPBOARD
  VBoxClient_SOURCES  += \
@@ -184 +197 @@
         clipboard-common.cpp \
         clipboard-x11.cpp
- ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-  VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS VBOX_WITH_SHARED_CLIPBOARD_GUEST
-  VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/common/mime-type-converter.cpp
-  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
-   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
-   VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp
-  endif
- endif
+
+ VBoxClient_DEFS += $(SharedClipboardTransfersDefs)
+ VBoxClient_SOURCES += $(SharedClipboardTransfersSources)
+
  ifdef VBOX_WITH_WAYLAND_ADDITIONS
   VBoxClient_DEFS += VBOX_WITH_WAYLAND_ADDITIONS
@@ -205 +210 @@
         wayland.cpp \
         wayland-helper-ipc.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/common/mime-type-converter.cpp \
         ../wlInclude/wayland-protocol.c \
         ../wlInclude/wlr-data-control-unstable-v1.c
@@ -280 +286 @@
         $(PATH_ROOT)/src/VBox/GuestHost/common/mime-type-converter.cpp
  vboxwl_SOURCES += $(VBOX_GH_SOURCES)
+
+ vboxwl_DEFS += $(SharedClipboardTransfersDefs)
+ vboxwl_SOURCES += $(SharedClipboardTransfersSources)
 
  VBOX_VBOXWL_LIBWAYLANDCLIENT_VER = 0