Changeset 34715 in vbox for trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

Timestamp:

Dec 3, 2010 11:25:52 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: switch to HGSMI and merge the two drivers into one file

File:

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

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

@@ -38 +38 @@
         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
         IN_MODULE XFree86Module
+ vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
  vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_3)/include \
@@ -68 +69 @@
         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
+ vboxvideo_drv_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
  vboxvideo_drv_SOURCES = \
-        vboxvideo_70.c \
-        vboxutils.c
+        vboxvideo_13.c \
+        vboxutils.c \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
 endif   # target linux
 
@@ -97 +105 @@
         $(VBOX_PATH_X11_XORG_7_0)/X11 \
         $(VBOX_PATH_X11_XORG_7_0)/xorg
+vboxvideo_drv_70_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
 
@@ -111 +120 @@
         $(VBOX_PATH_X11_XORG_7_1)/X11 \
         $(VBOX_PATH_X11_XORG_7_1)/xorg
+vboxvideo_drv_71_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_71_SOURCES  = $(vboxvideo_drv_SOURCES)
 
@@ -129 +139 @@
         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0
+vboxvideo_drv_13_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_13_SOURCES = \
         vboxvideo_13.c \
-        vboxutils.c
+        vboxutils.c \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
+        $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
 
 
@@ -152 +169 @@
         $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0
+vboxvideo_drv_14_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_13_SOURCES)
 
@@ -174 +192 @@
         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3
+vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_15_SOURCES  = $(vboxvideo_drv_13_SOURCES)
 if1of ($(KBUILD_TARGET), linux solaris)
@@ -197 +216 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
@@ -223 +243 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
@@ -249 +270 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+vboxvideo_drv_18_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
@@ -275 +297 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+vboxvideo_drv_19_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
 vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)