Changeset 28063 in vbox

Timestamp:

Apr 7, 2010 7:32:12 PM (15 years ago)

Author:

vboxsync

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

59773

Message:

Additions/x11: build the X.Org server 1.8 Additions

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

@@ -186 +186 @@
 
 
+#
+# vboxmouse_drv_18
+#
+DLLS += vboxmouse_drv_18
+vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_18_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.8.0 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
+        $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \
+        $(PATH_SUB_CURRENT)
+vboxmouse_drv_18_SOURCES = \
+        vboxmouse_15.c
+
+
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
@@ -255 +275 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
+     TESTING  += $(PATH_vboxmouse_drv_18)/tstvboxmouse18.run
+     OTHERS += $(PATH_vboxmouse_drv_18)/tstvboxmouse18.run
+$$(PATH_vboxmouse_drv_18)/tstvboxmouse18.run: $$(INSTARGET_vboxmouse_drv_18)
+        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+            $(INSTARGET_vboxmouse_drv_18) $(OUR_PATH_VBOXMOUSE)/undefined_15
+        $(QUIET)$(APPEND) -t "$@" "done"
+
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))

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

@@ -240 +240 @@
 
 
+#
+# vboxvideo_drv_18
+#
+DLLS += vboxvideo_drv_18
+vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxvideo_drv_18_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.8.0 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
+        $(VBOX_PATH_X11_ROOT)/xproto-7.0.15
+vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
+
+
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
@@ -307 +333 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
+     TESTING  += $(PATH_vboxvideo_drv_18)/tstvboxvideo18.run
+     OTHERS += $(PATH_vboxvideo_drv_18)/tstvboxvideo18.run
+$$(PATH_vboxvideo_drv_18)/tstvboxvideo18.run: $$(INSTARGET_vboxvideo_drv_18)
+        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+            $(INSTARGET_vboxvideo_drv_18) $(OUR_PATH_VBOXVIDEO)/undefined_13
+        $(QUIET)$(APPEND) -t "$@" "done"
+
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))