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

Timestamp:

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

Author:

vboxsync

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

70607

Message:

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

File:

• trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk (modified) (2 diffs)

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

@@ -300 +300 @@
 
 #
+# vboxvideo_drv_110rc
+#
+DLLS += vboxvideo_drv_110rc
+vboxvideo_drv_110rc_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_110rc_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+vboxvideo_drv_110rc_DEFS := $(vboxvideo_drv_15_DEFS)
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxvideo_drv_110rc_INCS = \
+        $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
+        $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
+        $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
+        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
+        $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
+        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
+        $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
+        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
+        $(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
+vboxvideo_drv_110rc_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+vboxvideo_drv_110rc_SOURCES := $(vboxvideo_drv_15_SOURCES)
+
+
+#
 # vboxvideo_drv_110
 #
@@ -319 +346 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
-        $(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