Changeset 51227 in vbox

Timestamp:

May 9, 2014 3:06:14 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93647

Message:

Additions/x11: make vboxvideo and vboxmouse use the new X.Org Server 1.0 and 1.1 header files for X.Org 7.0 and 7.1.

Location:

trunk/src/VBox/Additions/x11

Files:

• vboxmouse/Makefile.kmk (modified) (2 diffs)
• vboxvideo/Makefile.kmk (modified) (2 diffs)

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

@@ -75 +75 @@
         XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
 vboxmouse_drv_70_INCS := \
-        $(VBOX_PATH_X11_XORG_7_0) \
-        $(VBOX_PATH_X11_XORG_7_0)/X11 \
-        $(VBOX_PATH_X11_XORG_7_0)/xorg \
+        $(vboxmouse_xorg_INCS) \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.0.1 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_70_SOURCES = \
@@ -90 +89 @@
 vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_71_INCS := \
-        $(VBOX_PATH_X11_XORG_7_1) \
-        $(VBOX_PATH_X11_XORG_7_1)/X11 \
-        $(VBOX_PATH_X11_XORG_7_1)/xorg \
+        $(vboxmouse_xorg_INCS) \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.1.0 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_71_SOURCES = \

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

@@ -143 +143 @@
 endif
 vboxvideo_drv_70_INCS = \
-        $(VBOX_PATH_X11_XORG_7_0) \
-        $(VBOX_PATH_X11_XORG_7_0)/X11 \
-        $(VBOX_PATH_X11_XORG_7_0)/xorg
+        $(vboxvideo_xorg_INCS) \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.0.1
 vboxvideo_drv_70_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
@@ -158 +157 @@
 vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
 vboxvideo_drv_71_INCS = \
-        $(VBOX_PATH_X11_XORG_7_1) \
-        $(VBOX_PATH_X11_XORG_7_1)/X11 \
-        $(VBOX_PATH_X11_XORG_7_1)/xorg
+        $(vboxvideo_xorg_INCS) \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.1.0
 vboxvideo_drv_71_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_71_SOURCES  = $(vboxvideo_drv_SOURCES)