Changeset 27602 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 22, 2010 4:30:29 PM (15 years ago)

Author:

vboxsync

Message:

removed obsolete XFree86 4.2 headers

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/Makefile.kmk (modified) (1 diff)
• x11/vboxvideo/Makefile.kmk (modified) (2 diffs)
• x11/x11include/4.2 (deleted)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -151 +151 @@
         VBoxGuestR3LibVideo.cpp
 VBoxGuestR3LibXFree86_INCS     = \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/common/ \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/include \
-        $(VBOX_PATH_X11_XFREE_4_2)/exports/include/X11
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
+        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
+        $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
 
 

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

@@ -44 +44 @@
  vboxvideo_drv_CFLAGS.linux := \
         -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros)
- ARGB_CURSORS=1
- ifdef ARGB_CURSORS
-  vboxvideo_drv_INCS = \
+ vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_3)/include \
         $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
@@ -76 +74 @@
         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
- else
-  vboxvideo_drv_INCS = \
-        $(VBOX_PATH_X11_XFREE_4_2)/exports/include/X11 \
-        $(VBOX_PATH_X11_XFREE_4_2)/include \
-        $(VBOX_PATH_X11_XFREE_4_2)/include/extensions \
-        $(VBOX_PATH_X11_XFREE_4_2)/include/fonts \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/afb \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/include \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/fb \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/common \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/ddc \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/int10 \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/i2c \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support/bus \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support/vbe \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/rac \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/ramdac \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/shadowfb \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/vgahw \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/xf1bpp \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/xf24_32bpp \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/xf4bpp \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/mfb \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/mi \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/miext/shadow \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/render \
-        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/Xext
- endif
  vboxvideo_drv_SOURCES = \
         vboxvideo_70.c \