From: Oliver Kurth Date: Tue, 19 Jun 2018 18:07:45 +0000 (-0700) Subject: open-vm-tools: build for FreeBSD fails in fakeMouseWayland X-Git-Tag: stable-10.3.0~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99af79200f91c246580197b5698995fba4dc47af;p=thirdparty%2Fopen-vm-tools.git open-vm-tools: build for FreeBSD fails in fakeMouseWayland Root Cause: In the file fakeMouseWayland.cpp, several Linux related header files are included: These header files do not exist for FreeBSD and Solaris. Solution: Lib fakeMouse is not needed by FreeBSD and Solaris, so update the makefile to build the fakemouse related code only on Linux. --- diff --git a/open-vm-tools/services/plugins/dndcp/Makefile.am b/open-vm-tools/services/plugins/dndcp/Makefile.am index e45557893..6ce87b2f2 100644 --- a/open-vm-tools/services/plugins/dndcp/Makefile.am +++ b/open-vm-tools/services/plugins/dndcp/Makefile.am @@ -27,7 +27,6 @@ libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dndGuest libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/xutils -libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/fakeMouse libdndcp_la_CPPFLAGS += -I$(top_srcdir)/include libdndcp_la_CPPFLAGS += @XDR_CPPFLAGS@ @@ -78,8 +77,6 @@ libdndcp_la_SOURCES += dndGuest/dndCPTransportGuestRpc.cpp libdndcp_la_SOURCES += stringxx/string.cc libdndcp_la_SOURCES += xutils/xutils.cc -libdndcp_la_SOURCES += fakeMouseWayland/fakeMouseWayland.cpp - libdndcp_la_SOURCES += copyPasteCompat.c libdndcp_la_SOURCES += copyPasteCompatX11.c libdndcp_la_SOURCES += copyPasteDnDWrapper.cpp @@ -90,6 +87,12 @@ libdndcp_la_SOURCES += dndcp.cpp libdndcp_la_SOURCES += dragDetWndX11.cpp libdndcp_la_SOURCES += pointer.cpp +if LINUX +libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/fakeMouse +libdndcp_la_SOURCES += fakeMouseWayland/fakeMouseWayland.cpp +libdndcp_la_CPPFLAGS += -DUSE_UINPUT +endif + if HAVE_MKDTEMP libdndcp_la_CPPFLAGS += -DDND_IS_XDG libdndcp_la_SOURCES += dnd/dndXdg.c