Changeset 39786 in vbox

Timestamp:

Jan 17, 2012 10:10:38 PM (13 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxmouse: use the new code for X.Org 7.0, 7.1 and 7.2 too.

Location:

trunk/src/VBox/Additions

Files:

• linux/installer/vboxadd-x11.sh (modified) (2 diffs)
• x11/vboxmouse/Makefile.kmk (modified) (6 diffs)

trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh

@@ -393 +393 @@
             vboxmouse_src=vboxmouse_drv_71.so
             automouse=""
-            newmouse=""
             ;;
         6.9.* | 7.0.* )
@@ -400 +399 @@
             vboxmouse_src=vboxmouse_drv_70.so
             automouse=""
-            newmouse=""
             ;;
         6.7* | 6.8.* | 4.2.* | 4.3.* )

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

@@ -63 +63 @@
 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_70_DEFS = \
-        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
+        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
  vboxmouse_drv_70_DEFS += _XPG6 __EXTENSIONS__
@@ -73 +73 @@
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_70_SOURCES = \
-        xorg70/mouse.c \
-        xorg70/pnp.c \
-        VBoxUtils.c
+        vboxmouse_15.c
 
 
@@ -83 +81 @@
 DLLS += vboxmouse_drv_71
 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
-vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
+vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_71_INCS := \
         $(VBOX_PATH_X11_XORG_7_1) \
@@ -90 +88 @@
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_71_SOURCES = \
-        xorg71/mouse.c \
-        xorg71/pnp.c \
-        VBoxUtils.c
+        vboxmouse_15.c
 
 
@@ -262 +258 @@
         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh  $(KBUILD_TARGET) \
-            $(vboxmouse_drv_70_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_70
+            $(vboxmouse_drv_70_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15
         $(QUIET)$(APPEND) -t "$@" "done"
 
@@ -270 +266 @@
         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-            $(vboxmouse_drv_71_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_71
+            $(vboxmouse_drv_71_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15
         $(QUIET)$(APPEND) -t "$@" "done"