VirtualBox

Changeset 69098 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Oct 17, 2017 8:59:16 AM (7 years ago)
Author:
vboxsync
Message:

Clean up XFree86 driver header files.
bugref:3810: X11 Guest Additions maintenance
Over the years we have cleaned up the layout in the tree of the X.Org
header files we use to build drivers. The XFree86 ones were still in their
original, rather sub-optimal layout. This change fixes that.

Location:
trunk/src/VBox/Additions
Files:
1 added
7 deleted
3 edited
215 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk

    r68642 r69098  
    211211        VBoxGuestR3LibRuntimeXF86.cpp
    212212VBoxGuestR3LibXFree86_INCS     = \
    213         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
    214         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
    215         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
    216         $(VBOX_PATH_X11_XFREE_4_3)/include \
    217         $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
     213        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
     214        $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
     215        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11
    218216
    219217#
  • trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

    r62530 r69098  
    4646        IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
    4747 vboxmouse_drv_INCS := \
    48         $(VBOX_PATH_X11_XFREE_4_3)/include \
    49         $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
    50         $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
    51         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \
    52         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \
    53         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
    54         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \
    55         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \
    56         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
     48        $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
     49        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11 \
     50        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11/extensions \
     51        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
    5752        $(PATH_SUB_CURRENT)
    5853 vboxmouse_drv_SOURCES = \
  • trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    r69079 r69098  
    9797        IN_MODULE XFree86Module IN_XF86_MODULE IN_RT_STATIC
    9898vboxvideo_drv_INCS = \
    99         $(VBOX_PATH_X11_XFREE_4_3)/include \
    100         $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
    101         $(VBOX_PATH_X11_XFREE_4_3)/include/X11/extensions \
    102         $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
    103         $(VBOX_PATH_X11_XFREE_4_3)/include/fonts \
    104         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/afb \
    105         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
    106         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/fb \
    107         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \
    108         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \
    109         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ddc \
    110         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/int10 \
    111         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/i2c \
    112         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
    113         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vbe \
    114         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \
    115         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/rac \
    116         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ramdac \
    117         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/shadowfb \
    118         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vgahw \
    119         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf1bpp \
    120         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf24_32bpp \
    121         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf4bpp \
    122         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mfb \
    123         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \
    124         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/miext/shadow \
    125         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/render \
    126         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
    127         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
     99        $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
     100        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11 \
     101        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11/extensions \
     102        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11/fonts \
     103        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver
    128104vboxvideo_drv_INCS += \
    129105        $(PATH_ROOT)/src/VBox/Runtime/include \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette