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

Timestamp:

Feb 3, 2011 3:56:03 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11: build the X.Org drivers for the current X.Org Server 1.10 beta snapshot

File:

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

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

@@ -72 +72 @@
 vboxvideo_drv_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_SOURCES = \
+        vboxutils.c \
         vboxvideo.c \
-        vboxutils.c \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp \
@@ -291 +291 @@
 
 
+#
+# vboxvideo_drv_110
+#
+DLLS += vboxvideo_drv_110
+vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxvideo_drv_110_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_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+vboxvideo_drv_110_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.
@@ -382 +409 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
+     TESTING += $(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo19.run
+     OTHERS += $(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo19.run
+$$(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo19.run: $$(INSTARGET_vboxvideo_drv_110)
+        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+            $(INSTARGET_vboxvideo_drv_110) $(VBOXVIDEO_SRC_PATH)/undefined
+        $(QUIET)$(APPEND) -t "$@" "done"
+
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))