Changeset 34722 in vbox

Timestamp:

Dec 4, 2010 11:08:00 PM (14 years ago)

Author:

vboxsync

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

68527

Message:

Additions/x11/vboxvideo: vboxvideo_13.c -> vboxvideo.c

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (5 diffs)
• vboxvideo.c (copied) (copied from trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_13.c )

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

@@ -71 +71 @@
  vboxvideo_drv_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
  vboxvideo_drv_SOURCES = \
-        vboxvideo_13.c \
+        vboxvideo.c \
         vboxutils.c \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
@@ -131 +131 @@
 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
+vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) vboxvideo
 vboxvideo_drv_13_INCS = \
         $(VBOX_PATH_X11_XORG_1_3) \
@@ -141 +141 @@
         $(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 \
-        $(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
+vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
 
 
 #
 # vboxvideo_drv_14
-#
-# This uses the same code (vboxvideo_13.c) as 1.3, but is built
-# for 1.4 as well in case there should be any relevant header changes.
 #
 DLLS += vboxvideo_drv_14
@@ -171 +160 @@
         $(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)
+vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_SOURCES)
 
 
@@ -194 +183 @@
         $(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)
+vboxvideo_drv_15_SOURCES  = $(vboxvideo_drv_SOURCES)
 if1of ($(KBUILD_TARGET), linux solaris)
  vboxvideo_drv_15_SOURCES += \