VirtualBox

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


Ignore:
Timestamp:
Jan 20, 2017 9:23:53 AM (8 years ago)
Author:
vboxsync
Message:

bugref:8282: Additions/linux: submit DRM driver to the Linux kernel: move all graphics device-related header files to a separate sub-directory and add that to the include path where they are needed. The intention is too be able to remove the VBox/ include folder in the DRM driver package.

Location:
trunk/src/VBox/Additions
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

    r63018 r65381  
    2727#define ___VBoxMPIf_h___
    2828
    29 #include <VBox/VBoxVideo.h>
     29#include <VBoxVideo.h>
    3030#include "../../../../include/VBoxDisplay.h"
    3131#include "../VBoxVideoTools.h"
    32 #include <VBox/VBoxUhgsmi.h>
     32#include <VBoxUhgsmi.h>
    3333#include <VBox/VBoxGuest2.h>
    3434

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoIOCTL.h

    r62522 r65381  
    2121
    2222#include <VBox/VMMDev.h>
    23 #include <VBox/HGSMI/HGSMI.h>
     23#include <HGSMI.h>
    2424
    2525/* ==================== Virtual Box specific VRP's ==================== */

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

    r63107 r65381  
    3838endif
    3939#VBoxDisp_DEFS         += VBOX_VBVA_ADJUST_RECT
    40 VBoxDisp_INCS          = ../../../include ..
     40VBoxDisp_INCS          = ../../../include .. $(VBOX_GRAPHICS_INCS)
    4141VBoxDisp_LDFLAGS.x86   = /Entry:DrvEnableDriver@12
    4242VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver
    … …  
    108108        ../../../include \
    109109        .. \
    110         $(VBOX_PATH_CROGL_INCLUDE)
     110        $(VBOX_PATH_CROGL_INCLUDE) \
     111        $(VBOX_GRAPHICS_INCS)
    111112VBoxDispD3D_SOURCES  = \
    112113        wddm/VBoxDispD3D.cpp \
    … …  
    151152#use same defines as VBoxDispD3D to ensure structure definitions match
    152153VBoxCrHgsmi_DEFS        = $(subst VBOXWDDMDISP,IN_VBOXCRHGSMI,$(VBoxDispD3D_DEFS))
    153 VBoxCrHgsmi_INCS        = ../../../include .. $(VBOX_PATH_CROGL_INCLUDE)
     154VBoxCrHgsmi_INCS        = \
     155        ../../../include \
     156        .. \
     157        $(VBOX_PATH_CROGL_INCLUDE) \
     158        $(VBOX_GRAPHICS_INCS)
    154159VBoxCrHgsmi_SOURCES     = \
    155160        wddm/VBoxCrHgsmi.cpp \
    … …  
    177182VBoxDispMpLogger_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    178183VBoxDispMpLogger_DEFS        = UNICODE _UNICODE VBOX_WITH_CRHGSMI IN_VBOXCRHGSMI VBOX_WITH_WDDM VBOX_WITH_VDMA VBOX_WITH_HGCM
    179 VBoxDispMpLogger_INCS        = ../../../include ..
     184VBoxDispMpLogger_INCS        = ../../../include .. $(VBOX_GRAPHICS_INCS)
    180185VBoxDispMpLogger_SOURCES     = \
    181186    wddm/VBoxDispMpLogger.cpp

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxCrHgsmi.cpp

    r62856 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxCrHgsmi.h>
     19#include <VBoxCrHgsmi.h>
    2020#include <iprt/err.h>
    2121

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

    r64766 r65381  
    2828#include "VBoxDispD3DCmn.h"
    2929#include "VBoxDispD3D.h"
    30 #include <VBox/VBoxCrHgsmi.h>
     30#include <VBoxCrHgsmi.h>
    3131
    3232#include <Psapi.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.h

    r63018 r65381  
    1919#define ___VBoxUhgsmiBase_h__
    2020
    21 #include <VBox/VBoxUhgsmi.h>
    22 #include <VBox/VBoxCrHgsmi.h>
     21#include <VBoxUhgsmi.h>
     22#include <VBoxCrHgsmi.h>
    2323
    2424#include <iprt/win/windows.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispInternal.h

    r63033 r65381  
    3535#include "common/xpdm/VBoxVideoPortAPI.h"
    3636#include "common/xpdm/VBoxVideoIOCTL.h"
    37 #include <VBox/HGSMI/HGSMI.h>
    38 #include <VBox/VBoxVideo.h>
    39 #include <VBox/VBoxVideoGuest.h>
     37#include <HGSMI.h>
     38#include <VBoxVideo.h>
     39#include <VBoxVideoGuest.h>
    4040#include <VBoxDisplay.h>
    4141

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp

    r63060 r65381  
    1818#include "VBoxDisp.h"
    1919#include "VBoxDispMini.h"
    20 #include <VBox/HGSMI/HGSMIChSetup.h>
     20#include <HGSMIChSetup.h>
    2121
    2222#ifdef VBOX_VBVA_ADJUST_RECT

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

    r62522 r65381  
    3333 VBoxVideo_DEFS        += VBOX_WITH_VIDEOHWACCEL
    3434endif
    35 VBoxVideo_INCS          = ../../../include .. .
     35VBoxVideo_INCS          = ../../../include .. . $(VBOX_GRAPHICS_INCS)
    3636VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
    3737VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
    … …  
    9999        $(VBOX_PATH_CROGL_INCLUDE) \
    100100        $(VBOX_PATH_CROGL_GENFILES) \
    101         $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer
     101        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer \
     102        $(VBOX_GRAPHICS_INCS)
    102103
    103104 VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp

    r65193 r65381  
    1818
    1919#include "VBoxMPCommon.h"
    20 #include <VBox/Hardware/VBoxVideoVBE.h>
     20#include <VBoxVideoVBE.h>
    2121
    2222int VBoxMPCmnMapAdapterMemory(PVBOXMP_COMMON pCommon, void **ppv, uint32_t ulOffset, uint32_t ulSize)

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

    r63823 r65381  
    2020
    2121#include "VBoxMPUtils.h"
    22 #include <VBox/VBoxVideoGuest.h>
     22#include <VBoxVideoGuest.h>
    2323
    2424#ifdef VBOX_XPDM_MINIPORT

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

    r65193 r65381  
    2323#endif
    2424#include <wchar.h>
    25 #include <VBox/Hardware/VBoxVideoVBE.h>
     25#include <VBoxVideoVBE.h>
    2626
    2727#ifdef VBOX_WITH_WDDM

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

    r65193 r65381  
    1717
    1818#include "VBoxMPWddm.h"
    19 #include <VBox/Hardware/VBoxVideoVBE.h>
     19#include <VBoxVideoVBE.h>
    2020#include <stdio.h>
    2121

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.h

    r62522 r65381  
    2121
    2222#include <iprt/cdefs.h>
    23 #include <VBox/VBoxVideo.h>
     23#include <VBoxVideo.h>
    2424
    2525#include "common/VBoxMPUtils.h"

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.h

    r62522 r65381  
    2121#include <iprt/cdefs.h>
    2222#include <iprt/asm.h>
    23 #include <VBox/VBoxVideo.h>
    24 #include <VBox/HGSMI/HGSMI.h>
     23#include <VBoxVideo.h>
     24#include <HGSMI.h>
    2525
    2626typedef struct _VBOXMP_DEVEXT *PVBOXMP_DEVEXT;

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

    r65193 r65381  
    2626
    2727#include <VBox/VBoxGuestLib.h>
    28 #include <VBox/VBoxVideo.h>
     28#include <VBoxVideo.h>
    2929#include <wingdi.h> /* needed for RGNDATA definition */
    3030#include <VBoxDisplay.h> /* this is from Additions/WINNT/include/ to include escape codes */
    31 #include <VBox/Hardware/VBoxVideoVBE.h>
     31#include <VBoxVideoVBE.h>
    3232#include <VBox/Version.h>
    3333

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

    r65193 r65381  
    2121*********************************************************************************************************************************/
    2222#include "VBoxMPInternal.h"
    23 #include <VBox/Hardware/VBoxVideoVBE.h>
     23#include <VBoxVideoVBE.h>
    2424#include <VBox/VBoxGuestLib.h>
    25 #include <VBox/VBoxVideo.h>
     25#include <VBoxVideo.h>
    2626#include "common/VBoxMPHGSMI.h"
    2727#include "common/VBoxMPCommon.h"

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

    r65193 r65381  
    1919#include "VBoxMPInternal.h"
    2020#include "common/VBoxMPCommon.h"
    21 #include <VBox/Hardware/VBoxVideoVBE.h>
     21#include <VBoxVideoVBE.h>
    2222#include <VBox/VBoxGuestLib.h>
    23 #include <VBox/VBoxVideo.h>
     23#include <VBoxVideo.h>
    2424
    2525/* Note: in/out parameters passed to VBoxDrvStartIO point to the same memory location.

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp

    r63566 r65381  
    1717
    1818#include "VBoxMPInternal.h"
    19 #include <VBox/VBoxVideo.h>
     19#include <VBoxVideo.h>
    2020#include <VBox/VBoxGuestLib.h>
    2121#include <iprt/asm.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

    r63107 r65381  
    194194#wined3d_DEFS        += VBOX_WITH_WINE_FIXES
    195195wined3d_INCS        := \
    196         vbox/libWineStub/include
     196        vbox/libWineStub/include \
     197        $(VBOX_GRAPHICS_INCS)
    197198wined3d_SOURCES     := \
    198199        wined3d/arb_program_shader.c \

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/directx.c

    r63025 r65381  
    3939#include "winternl.h"
    4040#ifdef VBOX_WITH_WDDM
    41 #include <VBox/VBoxCrHgsmi.h>
     41#include <VBoxCrHgsmi.h>
    4242#endif
    4343

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.c

    r63025 r65381  
    1919#include "vboxext.h"
    2020#ifdef VBOX_WITH_WDDM
    21 #include <VBox/VBoxCrHgsmi.h>
     21#include <VBoxCrHgsmi.h>
    2222#include <iprt/err.h>
    2323#endif

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_private.h

    r63020 r65381  
    8383# define VBoxTlsRefSetImpl(_tls, _val) (TlsSetValue((DWORD)(_tls), (_val)))
    8484# define VBoxTlsRefAssertImpl Assert
    85 # include <VBox/VBoxVideo3D.h>
     85# include <VBoxVideo3D.h>
    8686#endif
    8787

  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r63107 r65381  
    2929        VBOX_WITH_HGCM \
    3030        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
    31 VBoxTray_INCS     = ../include
     31VBoxTray_INCS     = ../include $(VBOX_GRAPHICS_INCS)
    3232VBoxTray_SOURCES  = \
    3333        VBoxTray.cpp \

  • trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

    r65193 r65381  
    8484
    8585/* for VBOX_VIDEO_MAX_SCREENS definition */
    86 #include <VBox/Hardware/VBoxVideoVBE.h>
     86#include <VBoxVideo.h>
    8787
    8888typedef struct VBOXWDDM_RECOMMENDVIDPN_SOURCE

  • trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

    r65193 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxVideoGuest.h>
    20 #include <VBox/VBoxVideo.h>
    21 #include <VBox/Hardware/VBoxVideoVBE.h>
     19#include <VBoxVideoGuest.h>
     20#include <VBoxVideoVBE.h>
    2221
    2322#include <iprt/asm.h>

  • trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

    r65193 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxVideoGuest.h>
    20 #include <VBox/VBoxVideo.h>
    21 #include <VBox/Hardware/VBoxVideoVBE.h>
     19#include <VBoxVideoGuest.h>
     20#include <VBoxVideoVBE.h>
    2221
    2322#ifndef VBOX_GUESTR3XF86MOD

  • trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

    r64650 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxVideoGuest.h>
    20 #include <VBox/VBoxVideo.h>
     19#include <VBoxVideoGuest.h>
    2120#include <VBox/err.h>
    2221// #include <VBox/log.h>

  • trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

    r64295 r65381  
    6666#
    6767VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
    68 VBoxOGL_INCS           = .
     68VBoxOGL_INCS           = . $(VBOX_GRAPHICS_INCS)
    6969if1of ($(KBUILD_TARGET), linux solaris freebsd)
    7070 ifndef VBOX_USE_SYSTEM_GL_HEADERS
    … …  
    448448VBoxOGLarrayspu_TEMPLATE      = VBOXCROGLR3GUESTDLL
    449449VBoxOGLarrayspu_INCS          = \
    450         array
     450        array \
     451        $(VBOX_GRAPHICS_INCS)
    451452if1of ($(KBUILD_TARGET), linux solaris freebsd)
    452453 VBoxOGLarrayspu_INCS += \
    … …  
    496497VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
    497498VBoxOGLpassthroughspu_INCS        = \
    498         passthrough
     499        passthrough \
     500        $(VBOX_GRAPHICS_INCS)
    499501if1of ($(KBUILD_TARGET), linux solaris freebsd)
    500502 VBoxOGLpassthroughspu_INCS += \
    … …  
    545547VBoxOGLpackspu_DEFS          = TRACKS_STATE=1 PACKS=1
    546548VBoxOGLpackspu_INCS          = \
    547         pack
     549        pack \
     550        $(VBOX_GRAPHICS_INCS)
    548551if1of ($(KBUILD_TARGET), linux solaris freebsd)
    549552 VBoxOGLpackspu_INCS += \
    … …  
    651654VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
    652655VBoxOGLfeedbackspu_INCS        = \
    653         feedback
     656        feedback \
     657        $(VBOX_GRAPHICS_INCS)
    654658if1of ($(KBUILD_TARGET), linux solaris freebsd)
    655659 VBoxOGLfeedbackspu_INCS += \

  • trunk/src/VBox/Additions/common/crOpenGL/icd_drv.c

    r62848 r65381  
    2323
    2424#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
    25 # include <VBox/VBoxCrHgsmi.h>
    26 # include <VBox/VBoxUhgsmi.h>
     25# include <VBoxCrHgsmi.h>
     26# include <VBoxUhgsmi.h>
    2727#endif
    2828

  • trunk/src/VBox/Additions/common/crOpenGL/load.c

    r65065 r65381  
    3535
    3636#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
    37 # include <VBox/VBoxCrHgsmi.h>
     37# include <VBoxCrHgsmi.h>
    3838#endif
    3939

  • trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c

    r56008 r65381  
    2828
    2929#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
    30 # include <VBox/VBoxCrHgsmi.h>
    31 # include <VBox/VBoxUhgsmi.h>
     30# include <VBoxCrHgsmi.h>
     31# include <VBoxUhgsmi.h>
    3232#endif
    3333

  • trunk/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk

    r62526 r65381  
    6969        $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \
    7070        $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest \
    71         $(PATH_ROOT)/src/VBox/Runtime/r0drv/haiku
     71        $(PATH_ROOT)/src/VBox/Runtime/r0drv/haiku \
     72        $(VBOX_GRAPHICS_INCS)
    7273vboxvideo_SOURCES         = \
    7374        driver.cpp \

  • trunk/src/VBox/Additions/haiku/VBoxVideo/driver/driver.cpp

    r63566 r65381  
    5656#include <graphic_driver.h>
    5757#include <VBoxGuest-haiku.h>
    58 #include <VBox/VBoxVideoGuest.h>
     58#include <VBoxVideoGuest.h>
    5959#include "../common/VBoxVideo_common.h"
    6060

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

    r62527 r65381  
    5353vboxvideo_drm_INCS           += \
    5454  ../../../Runtime/include \
    55   ../../../Runtime/r0drv/linux
     55  ../../../Runtime/r0drv/linux \
     56  $(VBOX_GRAPHICS_INCS)
    5657vboxvideo_drm_SOURCES         = \
    5758  ../../common/VBoxVideo/HGSMIBase.cpp \

  • trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

    r65193 r65381  
    3636    ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \
    3737    ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \
    38     ${PATH_ROOT}/include/VBox/VBoxVideo.h=>include/VBox/VBoxVideo.h \
    39     ${PATH_ROOT}/include/VBox/VBoxVideoGuest.h=>include/VBox/VBoxVideoGuest.h \
    40     ${PATH_ROOT}/include/VBox/HGSMI/HGSMI.h=>include/VBox/HGSMI/HGSMI.h \
    41     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIChannels.h=>include/VBox/HGSMI/HGSMIChannels.h \
    42     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIChSetup.h=>include/VBox/HGSMI/HGSMIChSetup.h \
    43     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIDefs.h=>include/VBox/HGSMI/HGSMIDefs.h \
    44     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIMemAlloc.h=>include/VBox/HGSMI/HGSMIMemAlloc.h \
    45     ${PATH_ROOT}/include/VBox/Hardware/VBoxVideoVBE.h=>include/VBox/Hardware/VBoxVideoVBE.h \
     38    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>include/VBoxVideo.h \
     39    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>include/VBoxVideoGuest.h \
     40    ${PATH_ROOT}/include/VBox/Graphics/HGSMI.h=>include/HGSMI.h \
     41    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChannels.h=>include/HGSMIChannels.h \
     42    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChSetup.h=>include/HGSMIChSetup.h \
     43    ${PATH_ROOT}/include/VBox/Graphics/HGSMIDefs.h=>include/HGSMIDefs.h \
     44    ${PATH_ROOT}/include/VBox/Graphics/HGSMIMemAlloc.h=>include/HGSMIMemAlloc.h \
     45    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>include/VBoxVideoVBE.h \
    4646    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>HGSMIBase.c \
    4747    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \

  • trunk/src/VBox/Additions/linux/drm/vbox_drv.h

    r64919 r65381  
    5151#define LOG_GROUP LOG_GROUP_DEV_VGA
    5252
    53 #include <VBox/VBoxVideoGuest.h>
     53#include <VBoxVideoGuest.h>
    5454
    5555#include <drm/drmP.h>

  • trunk/src/VBox/Additions/linux/drm/vbox_fb.c

    r64959 r65381  
    4848/* Include from most specific to most general to be able to override things. */
    4949#include "vbox_drv.h"
    50 #include <VBox/VBoxVideo.h>
     50#include <VBoxVideo.h>
    5151
    5252#include <linux/module.h>

  • trunk/src/VBox/Additions/linux/drm/vbox_irq.c

    r64919 r65381  
    4646#include "vbox_drv.h"
    4747
    48 #include <VBox/VBoxVideo.h>
     48#include <VBoxVideo.h>
    4949
    5050#include <drm/drm_crtc_helper.h>

  • trunk/src/VBox/Additions/linux/drm/vbox_main.c

    r64425 r65381  
    4848#include "vbox_drv.h"
    4949
    50 #include <VBox/VBoxVideoGuest.h>
    51 #include <VBox/VBoxVideo.h>
     50#include <VBoxVideoGuest.h>
     51#include <VBoxVideoVBE.h>
    5252
    5353#include <drm/drm_fb_helper.h>

  • trunk/src/VBox/Additions/linux/drm/vbox_mode.c

    r64919 r65381  
    5050#include "vbox_drv.h"
    5151
    52 #include <VBox/VBoxVideo.h>
     52#include <VBoxVideo.h>
    5353
    5454#include <linux/export.h>

  • trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

    r63539 r65381  
    3030endif
    3131VBoxClient_DEFS.linux += _GNU_SOURCE
     32VBoxClient_INCS = $(VBOX_GRAPHICS_INCS)
    3233VBoxClient_SOURCES = \
    3334        main.cpp

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

    r64200 r65381  
    3737        $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    3838        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    39         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     39        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
     40        $(VBOX_GRAPHICS_INCS)
    4041
    4142vboxvideo.c_DEPS = $(VBOX_SVN_REV_HEADER)
    … …  
    9394        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
    9495        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
    95 vboxvideo_drv_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
     96vboxvideo_drv_INCS += \
     97        $(PATH_ROOT)/src/VBox/Runtime/include \
     98        $(VBOX_GRAPHICS_INCS)
    9699vboxvideo_drv_SOURCES = \
    97100        getmode.c \
    … …  
    381384 vboxvideo_drv_system_INCS += \
    382385        $(PATH_ROOT)/src/VBox/Runtime/include \
     386        $(VBOX_GRAPHICS_INCS) \
    383387        /usr/include/x11 \
    384388        /usr/include/xorg \

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

    r65193 r65381  
    5757#include <VBox/VBoxGuest.h>
    5858#include <VBox/VBoxGuestLib.h>
    59 #include <VBox/Hardware/VBoxVideoVBE.h>
     59#include <VBoxVideoVBE.h>
    6060#include "version-generated.h"
    6161#include "product-generated.h"

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

    r65193 r65381  
    5353#define _VBOXVIDEO_H_
    5454
    55 #include <VBox/VBoxVideoGuest.h>
    56 #include <VBox/VBoxVideo.h>
     55#include <VBoxVideoGuest.h>
     56#include <VBoxVideo.h>
    5757#include "version-generated.h"
    5858
    … …  
    103103#define BOOL_STR(a) ((a) ? "TRUE" : "FALSE")
    104104
    105 #include <VBox/Hardware/VBoxVideoVBE.h>
     105#include <VBoxVideoVBE.h>
    106106
    107107#include "xf86str.h"
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