Changeset 36301 in vbox for trunk/src/VBox/Additions/x11/vboxmouse

Timestamp:

Mar 17, 2011 11:46:42 AM (14 years ago)

Author:

vboxsync

Message:

Additions/x11 and linux: add support for X.Org server 1.10 final

File:

• trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk (modified) (3 diffs)

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

@@ -216 +216 @@
 
 #
+# vboxmouse_drv_110rc
+#
+DLLS += vboxmouse_drv_110rc
+vboxmouse_drv_110rc_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_110rc_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_110rc_INCS := \
+        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
+        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.99.901+git20110131.be3be758 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
+        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+        $(PATH_SUB_CURRENT)
+vboxmouse_drv_110rc_SOURCES = \
+        vboxmouse_15.c
+
+
+#
 # vboxmouse_drv_110
 #
@@ -227 +247 @@
         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.99.901+git20110131.be3be758 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
@@ -326 +346 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
-     TESTING += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse19.run
-     OTHERS += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse19.run
-$$(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse19.run: $$(INSTARGET_vboxmouse_drv_110)
+     TESTING += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run
+     OTHERS += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run
+$$(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run: $$(INSTARGET_vboxmouse_drv_110)
         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \