Changeset 98416 in vbox for trunk/src/VBox/Additions/x11/VBoxClient
- Timestamp:
- Feb 1, 2023 4:25:17 PM (2 years ago)
- svn:sync-xref-src-repo-rev:
- 155660
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
r98196 r98416 31 31 # Use header files from our tree for randr and xinerama. and don't link but rather dlopen libXrand 32 32 # This is mostly because the GA build boxes can have a very old xrandr lib, so instead of linking we dlopen. 33 VBOX_WITH_DISTRO_XRAND_XINERAMA =33 VBOX_WITH_DISTRO_XRAND_XINERAMA = 34 34 35 35 # We don't yet have a seamless mode compilation flag, so define it here unconditionally. 36 VBOX_WITH_SEAMLESS :=136 VBOX_WITH_SEAMLESS := 1 37 37 38 38 # … … 73 73 endif 74 74 VBoxDRMClient_SOURCES = \ 75 76 77 75 display-drm.cpp \ 76 display-ipc.cpp \ 77 logging.cpp 78 78 79 79 … … 105 105 VBoxClient_DEFS += VBOX_DND_WITH_XTEST 106 106 VBoxClient_LIBS += \ 107 Xtst107 Xtst 108 108 endif 109 109 endif … … 114 114 ifeq ($(KBUILD_TARGET),linux) 115 115 VBoxClient_LDFLAGS.amd64 += \ 116 -Wl,--wrap=memcpy116 -Wl,--wrap=memcpy 117 117 endif 118 118 … … 120 120 VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS 121 121 VBoxClient_SOURCES += \ 122 hostversion.cpp122 hostversion.cpp 123 123 VBoxDRMClient_DEFS += VBOX_WITH_GUEST_PROPS 124 124 endif … … 126 126 ifdef VBOX_WITH_DRAG_AND_DROP 127 127 VBoxClient_DEFS += \ 128 VBOX_WITH_DRAG_AND_DROP \129 $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)128 VBOX_WITH_DRAG_AND_DROP \ 129 $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) 130 130 VBoxClient_SOURCES += \ 131 draganddrop.cpp131 draganddrop.cpp 132 132 VBoxClient_LIBS += \ 133 $(VBOX_LIB_VBGL_R3) \134 $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)133 $(VBOX_LIB_VBGL_R3) \ 134 $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB) 135 135 endif 136 136 … … 138 138 VBoxClient_DEFS += VBOX_WITH_SEAMLESS 139 139 VBoxClient_SOURCES += \ 140 seamless.cpp \141 seamless-x11.cpp140 seamless.cpp \ 141 seamless-x11.cpp 142 142 endif 143 143 … … 154 154 display-helper-generic.cpp 155 155 156 ### include $(PATH_SUB_CURRENT)/helpers/Makefile.kmk156 ### include $(PATH_SUB_CURRENT)/helpers/Makefile.kmk 157 157 endif 158 158 … … 160 160 VBoxClient_DEFS += VBOX_WITH_SHARED_CLIPBOARD 161 161 VBoxClient_SOURCES += \ 162 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \163 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \164 clipboard.cpp162 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \ 163 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \ 164 clipboard.cpp 165 165 ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS 166 166 VBoxClient_DEFS += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS VBOX_WITH_SHARED_CLIPBOARD_GUEST 167 167 VBoxClient_SOURCES += \ 168 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \169 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp168 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \ 169 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp 170 170 ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP 171 171 VBoxClient_DEFS += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP 172 172 VBoxClient_SOURCES += \ 173 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp173 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp 174 174 endif 175 175 ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE … … 177 177 # @todo Make this dynamic loading more generic. 178 178 VBoxClient_SOURCES += \ 179 $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \180 clipboard-fuse.cpp179 $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \ 180 clipboard-fuse.cpp 181 181 # @todo Ditto. 182 182 VBoxClient_INCS += \ 183 $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount183 $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount 184 184 endif 185 185 endif … … 189 189 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) 190 190 191 # Set this in LocalConfig.kmk if you are working on the X11 clipboard service192 # to automatically run the unit test at build time.193 # OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run191 # Set this in LocalConfig.kmk if you are working on the X11 clipboard service 192 # to automatically run the unit test at build time. 193 # OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run 194 194 195 195 PROGRAMS += tstSeamlessX11-auto 196 196 tstSeamlessX11-auto_TEMPLATE = VBoxR3TstExe 197 197 tstSeamlessX11-auto_SOURCES = \ 198 199 198 testcase/tstSeamlessX11-auto.cpp \ 199 seamless-x11.cpp 200 200 tstSeamlessX11-auto_DEFS = TESTCASE 201 201 tstSeamlessX11-auto_LIBS = \ 202 202 $(LIB_RUNTIME) 203 203 204 204 TESTING += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto 205 $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \206 205 $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \ 206 $$(tstSeamlessX11-auto_1_STAGE_TARGET) 207 207 export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet 208 208 $(QUIET)$(APPEND) -t "$@" "done" … … 216 216 tstSeamlessX11_TEMPLATE = VBoxR3TstExe 217 217 tstSeamlessX11_SOURCES = \ 218 219 220 218 testcase/tstSeamlessX11.cpp \ 219 seamless.cpp \ 220 seamless-x11.cpp 221 221 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 222 222 tstSeamlessX11_DEFS += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" … … 225 225 endif 226 226 tstSeamlessX11_LIBPATH = \ 227 227 $(VBOX_LIBPATH_X11) 228 228 tstSeamlessX11_LIBS = \ 229 230 231 232 229 $(LIB_RUNTIME) \ 230 Xext \ 231 Xmu \ 232 X11 233 233 endif 234 234 endif
Note:
See TracChangeset
for help on using the changeset viewer.