Changeset 5164 in vbox

Timestamp:

Oct 5, 2007 12:21:03 PM (18 years ago)

Author:

vboxsync

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

25063

Message:

Added support for X.org server 1.4 to the guest additions

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• xgraphics/Makefile.kmk (modified) (2 diffs)
• xgraphics/vboxvideo_14.c (copied) (copied from trunk/src/VBox/Additions/linux/xgraphics/vboxvideo_13.c )
• xmouse/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -60 +60 @@
                 $(PATH_BIN)/additions/vboxmouse_drv_70.so \
                 $(PATH_BIN)/additions/vboxmouse_drv_71.so \
+                $(PATH_BIN)/additions/vboxmouse_drv_14.so \
                 $(PATH_BIN)/additions/vboxvideo_drv.o \
                 $(PATH_BIN)/additions/vboxvideo_drv_70.so \
                 $(PATH_BIN)/additions/vboxvideo_drv_71.so \
                 $(PATH_BIN)/additions/vboxvideo_drv_13.so \
+                $(PATH_BIN)/additions/vboxvideo_drv_14.so \
                 installer/vboxvfs.sh $(PATH_BIN)/additions/mountvboxsf \
                 $(wildcard $(PATH_BIN)/additions/src/*) \
@@ -92 +94 @@
         $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_70.so $(PATH_TARGET)/install/vboxmouse_drv_70.so
         $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_71.so $(PATH_TARGET)/install/vboxmouse_drv_71.so
+        $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxmouse_drv_14.so $(PATH_TARGET)/install/vboxmouse_drv_14.so
         $(QUIET)objcopy -g -R .comment $(PATH_BIN)/additions/vboxvideo_drv.o  $(PATH_TARGET)/install/vboxvideo_drv.o
         $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_70.so $(PATH_TARGET)/install/vboxvideo_drv_70.so
         $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_71.so $(PATH_TARGET)/install/vboxvideo_drv_71.so
         $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_13.so $(PATH_TARGET)/install/vboxvideo_drv_13.so
+        $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/vboxvideo_drv_14.so $(PATH_TARGET)/install/vboxvideo_drv_14.so
         $(QUIET)$(INSTALL) -m 0755 installer/vboxvfs.sh $(PATH_TARGET)/install
         $(QUIET)objcopy -S -R .comment $(PATH_BIN)/additions/mountvboxsf $(PATH_TARGET)/install/mount.vboxsf

trunk/src/VBox/Additions/linux/xgraphics/Makefile.kmk

@@ -19 +19 @@
 
 SYSMODS  = vboxvideo_drv
-DLLS     = vboxvideo_drv_70 vboxvideo_drv_71 vboxvideo_drv_13
+DLLS     = vboxvideo_drv_70 vboxvideo_drv_71 vboxvideo_drv_13 vboxvideo_drv_14
 
 # for BUILD_TARGET=l4
@@ -143 +143 @@
         vboxutils.c
 
+vboxvideo_drv_14_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
+vboxvideo_drv_14_DEFS := $(vboxvideo_drv_70_DEFS)
+vboxvideo_drv_14_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
+vboxvideo_drv_14_LDFLAGS = -s 
+vboxvideo_drv_14_INCS = \
+        ../x11include/1.4 \
+        ../x11include/1.4/X11 \
+        ../x11include/1.4/xorg
+vboxvideo_drv_14_SOURCES  = \
+        vboxvideo_14.c \
+        vboxutils.c
 
 include $(PATH_KBUILD)/footer.kmk

trunk/src/VBox/Additions/linux/xmouse/Makefile.kmk

@@ -19 +19 @@
 
 SYSMODS  = vboxmouse_drv
-DLLS     = vboxmouse_drv_70 vboxmouse_drv_71
+DLLS     = vboxmouse_drv_70 vboxmouse_drv_71 vboxmouse_drv_14
 
 # for BUILD_TARGET=l4
@@ -84 +84 @@
 
 
+vboxmouse_drv_14_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
+vboxmouse_drv_14_DEFS = $(vboxmouse_drv_70_DEFS)
+vboxmouse_drv_14_LDFLAGS = -s
+vboxmouse_drv_14_INCS = \
+        ../x11include/1.4 \
+        ../x11include/1.4/X11 \
+        ../x11include/1.4/xorg \
+        $(PATH_SUB_CURRENT)
+vboxmouse_drv_14_SOURCES  = \
+        xorg14/mouse.c \
+        xorg14/pnp.c \
+        VBoxUtils.c
+
+
 include $(PATH_KBUILD)/footer.kmk