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

Timestamp:

Mar 22, 2013 9:57:51 AM (12 years ago)

Author:

vboxsync

Message:

Additions/X11: build vboxvideo_drv.so for X.Org Server 1.14.

File:

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

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

@@ -323 +323 @@
 
 
+#
+# vboxvideo_drv_114
+#
+DLLS += vboxvideo_drv_114
+vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
+vboxvideo_drv_114_INCS = \
+        $(vboxvideo_xorg_INCS) \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0
+vboxvideo_drv_114_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_15_SOURCES)
+
+
 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
@@ -329 +343 @@
  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_system_CFLAGS := \
-        $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
+        $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
  vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS)
  vboxvideo_drv_system_INCS += \
-        $(PATH_ROOT)/src/VBox/Runtime/include \
-        /usr/include/x11 \
-        /usr/include/X11/dri \
-        /usr/include/libdrm \
-        /usr/include/xorg \
-        /usr/include/pixman-1
+        $(PATH_ROOT)/src/VBox/Runtime/include \
+        /usr/include/x11 \
+        /usr/include/X11/dri \
+        /usr/include/libdrm \
+        /usr/include/xorg \
+        /usr/include/pixman-1
  vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_15_SOURCES)
 endif
@@ -376 +390 @@
     endef
 
-    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxvideo_test)))
+    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114, $(eval $(def_vboxvideo_test)))
 
     endif # ! VBOX_ONLY_SDK