VirtualBox

Changeset 11820

Show
Ignore:
Timestamp:
08/29/08 16:09:39 (3 months ago)
Author:
vboxsync
Message:

made Qt4 the default GUI; VBOX_VRDP => VBOX_WITH_VRDP; VBOX_HGCM => VBOX_WITH_HGCM; Makefile cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r11814 r11820  
    246246# The Qt GUI. 
    247247VBOX_WITH_QTGUI = 1 
    248 # The Qt 4 GUI (experimental). 
     248# The Qt 4 GUI. 
    249249VBOX_WITH_QT4GUI = 1 
    250250# The headless frontend. 

  • trunk/include/Makefile.kmk

    r11005 r11820  
    5858 
    5959SyntaxVBoxIncludeR3_TEMPLATE = VBOXMAINEXE 
    60 SyntaxVBoxIncludeR3_DEFS = VBOX_HGCM 
     60SyntaxVBoxIncludeR3_DEFS = VBOX_WITH_HGCM 
    6161SyntaxVBoxIncludeR3_SOURCES := \ 
    6262        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r3)))) \ 
    …… 
    6464 
    6565SyntaxVBoxIncludeR0_TEMPLATE = VBOXR0 
    66 SyntaxVBoxIncludeR0_DEFS = VBOX_HGCM 
     66SyntaxVBoxIncludeR0_DEFS = VBOX_WITH_HGCM 
    6767SyntaxVBoxIncludeR0_SOURCES := \ 
    6868        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.r0)))) \ 
    …… 
    7070 
    7171SyntaxVBoxIncludeGC_TEMPLATE = VBOXGC 
    72 SyntaxVBoxIncludeGC_DEFS = VBOX_HGCM 
     72SyntaxVBoxIncludeGC_DEFS = VBOX_WITH_HGCM 
    7373SyntaxVBoxIncludeGC_SOURCES := \ 
    7474        $(addprefix $(PATH_TARGET)/,$(subst .h,-c.c,     $(subst /,_,$(hdrs.gc)))) \ 

  • trunk/include/VBox/VBoxGuest.h

    r11643 r11820  
    171171    VMMDevReq_ReportGuestCapabilities    = 55, 
    172172    VMMDevReq_SetGuestCapabilities       = 56, 
    173 #ifdef VBOX_HGCM 
     173#ifdef VBOX_WITH_HGCM 
    174174    VMMDevReq_HGCMConnect                = 60, 
    175175    VMMDevReq_HGCMDisconnect             = 61, 
    …… 
    619619#pragma pack() 
    620620 
    621 #ifdef VBOX_HGCM 
     621#ifdef VBOX_WITH_HGCM 
    622622 
    623623/** HGCM flags. 
    …… 
    814814} VMMDevHGCMCancel; 
    815815 
    816 #endif /* VBOX_HGCM */ 
     816#endif /* VBOX_WITH_HGCM */ 
    817817 
    818818 
    …… 
    12201220 
    12211221 
    1222 #ifdef VBOX_HGCM 
     1222#ifdef VBOX_WITH_HGCM 
    12231223/* These structures are shared between the driver and other binaries, 
    12241224 * therefore packing must be defined explicitely. 
    …… 
    12551255# define VBOXGUEST_HGCM_CALL_PARMS(a)       ((HGCMFunctionParameter *)((uint8_t *)(a) + sizeof (VBoxGuestHGCMCallInfo))) 
    12561256 
    1257 #endif /* VBOX_HGCM */ 
     1257#endif /* VBOX_WITH_HGCM */ 
    12581258 
    12591259/* 
    …… 
    13391339        case VMMDevReq_SetGuestCapabilities: 
    13401340            return sizeof(VMMDevReqGuestCapabilities2); 
    1341 #ifdef VBOX_HGCM 
     1341#ifdef VBOX_WITH_HGCM 
    13421342        case VMMDevReq_HGCMConnect: 
    13431343            return sizeof(VMMDevHGCMConnect); 
    …… 
    13551355        case VMMDevReq_HGCMCancel: 
    13561356            return sizeof(VMMDevHGCMCancel); 
    1357 #endif /* VBOX_HGCM */ 
     1357#endif /* VBOX_WITH_HGCM */ 
    13581358        case VMMDevReq_VideoAccelEnable: 
    13591359            return sizeof(VMMDevVideoAccelEnable); 

  • trunk/include/VBox/VBoxGuestLib.h

    r8700 r11820  
    132132/** @} */ 
    133133 
    134 #ifdef VBOX_HGCM 
     134#ifdef VBOX_WITH_HGCM 
    135135 
    136136#ifdef VBGL_VBOXGUEST 
    …… 
    245245#endif /* !VBGL_VBOXGUEST */ 
    246246 
    247 #endif /* VBOX_HGCM */ 
     247#endif /* VBOX_WITH_HGCM */ 
    248248 
    249249 

  • trunk/include/VBox/pdmifs.h

    r11649 r11820  
    24032403 
    24042404 
    2405 #ifdef VBOX_HGCM 
     2405#ifdef VBOX_WITH_HGCM 
    24062406 
    24072407/** Abstract HGCM command structure. Used only to define a typed pointer. */ 

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

    r10516 r11820  
    3333DLLS += VBoxOGL 
    3434VBoxOGL_TEMPLATE    = VBOXGUESTR3EXE 
    35 VBoxOGL_DEFS        = VBOX_HGCM _WIN32_WINNT=0x0500 VBOX_OGL_GUEST_SIDE 
     35VBoxOGL_DEFS        = VBOX_WITH_HGCM _WIN32_WINNT=0x0500 VBOX_OGL_GUEST_SIDE 
    3636VBoxOGL_SOURCES     = \ 
    3737        dllmain.cpp \ 

  • trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk

    r10129 r11820  
    3636 
    3737tstShOpenGL_TEMPLATE = VBOXGUESTR3EXE 
    38 tstShOpenGL_DEFS     = VBOX_HGCM 
     38tstShOpenGL_DEFS     = VBOX_WITH_HGCM 
    3939tstShOpenGL_SOURCES  = tstShOpenGL.cpp 
    4040tstShOpenGL_LIBS     = $(PATH_SDK_WINPSDK_LIB)/OpenGL32.Lib 

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

    r11687 r11820  
    3636 VBoxGuest_NOINST     = true 
    3737endif 
    38 VBoxGuest_DEFS        = LOG_TO_BACKDOOR VBGL_VBOXGUEST VBOX_HGCM VBOX_REBOOT_ON_UNINSTALL 
     38VBoxGuest_DEFS        = LOG_TO_BACKDOOR VBGL_VBOXGUEST VBOX_WITH_HGCM VBOX_REBOOT_ON_UNINSTALL 
    3939#VBoxGuest_DEFS       += LOG_ENABLED 
    4040VBoxGuest_INCS        = ../include 

  • trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

    r10636 r11820  
    340340} 
    341341 
    342 #ifdef VBOX_HGCM 
     342#ifdef VBOX_WITH_HGCM 
    343343DECLVBGL(void) VBoxHGCMCallback (VMMDevHGCMRequestHeader *pHeader, void *pvData, uint32_t u32Data) 
    344344{ 
    …… 
    399399} 
    400400 
    401 #endif /* VBOX_HGCM */ 
     401#endif /* VBOX_WITH_HGCM */ 
    402402 
    403403static bool IsPowerOfTwo (uint32_t val) 
    …… 
    883883        } 
    884884 
    885 #ifdef VBOX_HGCM 
     885#ifdef VBOX_WITH_HGCM 
    886886        /* HGCM offers blocking IOCTLSs just like waitevent and actually 
    887887         * uses the same waiting code. 
    …… 
    10011001 
    10021002        } break; 
    1003 #endif /* VBOX_HGCM */ 
     1003#endif /* VBOX_WITH_HGCM */ 
    10041004 
    10051005#ifdef VBOX_WITH_VRDP_SESSION_HANDLING 

  • trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk

    r10129 r11820  
    3636 
    3737tstHook_TEMPLATE = VBOXGUESTR3EXE 
    38 tstHook_DEFS     = VBOX_HGCM 
     38tstHook_DEFS     = VBOX_WITH_HGCM 
    3939tstHook_SOURCES  = tstHook.cpp 
    4040tstHook_INCS     = ../../include 

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

    r10516 r11820  
    3333 VBoxTray_NOINST  = true 
    3434endif 
    35 VBoxTray_DEFS     = VBOX_HGCM LOG_TO_BACKDOOR 
     35VBoxTray_DEFS     = VBOX_WITH_HGCM LOG_TO_BACKDOOR 
    3636VBoxTray_INCS     = ../include 
    3737VBoxTray_SOURCES  = \ 

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

    r10129 r11820  
    3030PROGRAMS += tstSessionHack 
    3131tstSessionHack_TEMPLATE = VBOXW32GUESTR3 
    32 tstSessionHack_DEFS     = VBOX_HGCM 
     32tstSessionHack_DEFS     = VBOX_WITH_HGCM 
    3333tstSessionHack_INCS     = ../../include 
    3434tstSessionHack_SOURCES  = \ 

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

    r10869 r11820  
    3939endif 
    4040VBoxControl_DEFS     += \ 
    41         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_HGCM,) 
     41        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_WITH_HGCM,) 
    4242VBoxControl_SOURCES = \ 
    4343        VBoxControl.cpp \ 

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

    r8760 r11820  
    3535 endif 
    3636 VBoxGuest_TEMPLATE      = VBOXGUESTR0 
    37  VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_HGCM 
     37 VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM 
    3838 VBoxGuest_INCS         := $(PATH_SUB_CURRENT) 
    3939 ifneq ($(KBUILD_TARGET),os2) 
    …… 
    7979 SYSMODS.freebsd += vboxguest 
    8080 vboxguest_TEMPLATE      = VBOXGUESTR0 
    81  vboxguest_DEFS          = VBGL_VBOXGUEST VBOX_HGCM 
     81 vboxguest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM 
    8282 vboxguest_INCS         := \ 
    8383        $(PATH_SUB_CURRENT) 

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

    r10552 r11820  
    3737#include <iprt/assert.h> 
    3838#include <iprt/param.h> 
    39 #ifdef VBOX_HGCM 
     39#ifdef VBOX_WITH_HGCM 
    4040# include <iprt/thread.h> 
    4141#endif 
    …… 
    4545*   Internal Functions                                                         * 
    4646*******************************************************************************/ 
    47 #ifdef VBOX_HGCM 
     47#ifdef VBOX_WITH_HGCM 
    4848static DECLCALLBACK(void) VBoxGuestHGCMAsyncWaitCallback(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser, uint32_t u32User); 
    4949#endif 
    …… 
    156156    pDevExt->WaitList.pHead = NULL; 
    157157    pDevExt->WaitList.pTail = NULL; 
    158 #ifdef VBOX_HGCM 
     158#ifdef VBOX_WITH_HGCM 
    159159    pDevExt->HGCMWaitList.pHead = NULL; 
    160160    pDevExt->HGCMWaitList.pTail = NULL; 
    …… 
    213213            if (RT_SUCCESS(rc)) 
    214214            { 
    215 #ifdef VBOX_HGCM 
     215#ifdef VBOX_WITH_HGCM 
    216216                rc = vboxGuestInitFilterMask(pDevExt, VMMDEV_EVENT_HGCM); 
    217217#else 
    …… 
    293293 
    294294    VBoxGuestDeleteWaitList(&pDevExt->WaitList); 
    295 #ifdef VBOX_HGCM 
     295#ifdef VBOX_WITH_HGCM 
    296296    VBoxGuestDeleteWaitList(&pDevExt->HGCMWaitList); 
    297297#endif 
    …… 
    379379         pSession, pSession->Process, (int)pSession->Process, (uintptr_t)pSession->R0Process)); /** @todo %RTr0proc */ 
    380380 
    381 #ifdef VBOX_HGCM 
     381#ifdef VBOX_WITH_HGCM 
    382382    for (unsigned i = 0; i < RT_ELEMENTS(pSession->aHGCMClientIds); i++) 
    383383        if (pSession->aHGCMClientIds[i]) 
    …… 
    491491    pWait->fReqEvents = 0; 
    492492    pWait->fResEvents = 0; 
    493 #ifdef VBOX_HGCM 
     493#ifdef VBOX_WITH_HGCM 
    494494    pWait->pHGCMReq = NULL; 
    495495#endif 
    …… 
    510510    pWait->fReqEvents = 0; 
    511511    pWait->fResEvents = 0; 
    512 #ifdef VBOX_HGCM 
     512#ifdef VBOX_WITH_HGCM 
    513513    pWait->pHGCMReq = NULL; 
    514514#endif 
    …… 
    838838 
    839839 
    840 #ifdef VBOX_HGCM 
     840#ifdef VBOX_WITH_HGCM 
    841841 
    842842/** 
    …… 
    11411141} 
    11421142 
    1143 #endif /* VBOX_HGCM */ 
     1143#endif /* VBOX_WITH_HGCM */ 
    11441144 
    11451145 
    …… 
    12201220        rc = VBoxGuestCommonIOCtl_VMMRequest(pDevExt, (VMMDevRequestHeader *)pvData, cbData, pcbDataReturned); 
    12211221    } 
    1222 #ifdef VBOX_HGCM 
     1222#ifdef VBOX_WITH_HGCM 
    12231223    /* 
    12241224     * This one is tricky and can be done later. 
    …… 
    12291229        rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, cbData, pcbDataReturned); 
    12301230    } 
    1231 #endif /* VBOX_HGCM */ 
     1231#endif /* VBOX_WITH_HGCM */ 
    12321232    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_LOG(0))) 
    12331233    { 
    …… 
    12561256                break; 
    12571257 
    1258 #ifdef VBOX_HGCM 
     1258#ifdef VBOX_WITH_HGCM 
    12591259            case VBOXGUEST_IOCTL_HGCM_CONNECT: 
    12601260                CHECKRET_MIN_SIZE("HGCM_CONNECT", sizeof(VBoxGuestHGCMConnectInfo)); 
    …… 
    12711271                rc = VBoxGuestCommonIOCtl_HGCMClipboardReConnect(pDevExt, (uint32_t *)pvData, pcbDataReturned); 
    12721272                break; 
    1273 #endif /* VBOX_HGCM */ 
     1273#endif /* VBOX_WITH_HGCM */ 
    12741274 
    12751275            default: 
    …… 
    13221322            RTSpinlockAcquireNoInts(pDevExt->WaitSpinlock, &Tmp); 
    13231323 
    1324 #ifdef VBOX_HGCM 
     1324#ifdef VBOX_WITH_HGCM 
    13251325            /* The HGCM event/list is kind of different in that we evaluate all entries. */ 
    13261326            if (fEvents & VMMDEV_EVENT_HGCM) 

  • trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

    r8328 r11820  
    5151    /** The events we received. */ 
    5252    uint32_t volatile           fResEvents; 
    53 #ifdef VBOX_HGCM 
     53#ifdef VBOX_WITH_HGCM 
    5454    /** The HGCM request we're waiting for to complete. */ 
    5555    VMMDevHGCMRequestHeader volatile *pHGCMReq; 
    …… 
    8787    /** Wait-for-event list for threads waiting for multiple events. */ 
    8888    VBOXGUESTWAITLIST           WaitList; 
    89 #ifdef VBOX_HGCM 
     89#ifdef VBOX_WITH_HGCM 
    9090    /** Wait-for-event list for threads waiting on HGCM async completion. 
    9191     * The entire list is evaluated upon the arrival of an HGCM event, unlike 
    …… 
    139139    PVBOXGUESTDEVEXT            pDevExt; 
    140140 
    141 #ifdef VBOX_HGCM 
     141#ifdef VBOX_WITH_HGCM 
    142142    /** Array containing HGCM client IDs associated with this session. 
    143143     * This will be automatically disconnected when the session is closed. */ 

  • trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp

    r10541 r11820  
    178178        vbglQueryVMMDevPort (); 
    179179 
    180 #ifdef VBOX_HGCM 
     180#ifdef VBOX_WITH_HGCM 
    181181        rc = vbglHGCMInit (); 
    182 #endif /* VBOX_HGCM */ 
     182#endif /* VBOX_WITH_HGCM */ 
    183183 
    184184        if (VBOX_FAILURE(rc)) 
    …… 
    195195    vbglTerminateCommon (); 
    196196 
    197 #ifdef VBOX_HGCM 
     197#ifdef VBOX_WITH_HGCM 
    198198    vbglHGCMTerminate (); 
    199199#endif 

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

    r10797 r11820  
    5353# 
    5454VBoxGuestR0Lib_TEMPLATE     = VBOXGUESTR0LIB 
    55 VBoxGuestR0Lib_DEFS         = VBOX_HGCM 
     55VBoxGuestR0Lib_DEFS         = VBOX_WITH_HGCM 
    5656VBoxGuestR0Lib_INCS         = \ 
    5757        $(PATH_VBoxGuestR0Lib) 
    …… 
    6969# 
    7070VBoxGuestR0LibBase_TEMPLATE = VBOXGUESTR0LIB 
    71 VBoxGuestR0LibBase_DEFS     = VBOX_HGCM VBGL_VBOXGUEST 
     71VBoxGuestR0LibBase_DEFS     = VBOX_WITH_HGCM VBGL_VBOXGUEST 
    7272VBoxGuestR0LibBase_INCS     = $(VBoxGuestR0Lib_INCS) 
    7373VBoxGuestR0LibBase_INCS.win = $(VBoxGuestR0Lib_INCS.win) 
    …… 
    8585VBoxGuestR3Lib_TEMPLATE    = VBOXGUESTR3LIB 
    8686VBoxGuestR3Lib_DEFS        = \ 
    87         VBOX_HGCM \ 
     87        VBOX_WITH_HGCM \ 
    8888        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) 
    8989VBoxGuestR3Lib_SOURCES     = \ 
    …… 
    123123VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3LIB 
    124124VBoxGuestR3LibXFree86_DEFS     = \ 
    125         VBOX_HGCM VBOX_VBGLR3_XFREE86 \ 
     125        VBOX_WITH_HGCM VBOX_VBGLR3_XFREE86 \ 
    126126        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) 
    127127VBoxGuestR3LibXFree86_SOURCES  = \ 

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h

    r8155 r11820  
    108108int VbglEnter (void); 
    109109 
    110 #ifdef VBOX_HGCM 
     110#ifdef VBOX_WITH_HGCM 
    111111#ifndef VBGL_VBOXGUEST 
    112112/* Initialize HGCM subsystem. */ 

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

    r10129 r11820  
    4141VBoxService_TEMPLATE      = VBOXGUESTR3EXE 
    4242VBoxService_DEFS          = VBOXSERVICE_TIMESYNC 
    43 VBoxService_DEFS.os2      = VBOX_HGCM VBOXSERVICE_CLIPBOARD 
     43VBoxService_DEFS.os2      = VBOX_WITH_HGCM VBOXSERVICE_CLIPBOARD 
    4444VBoxService_SOURCES       = \ 
    4545        VBoxService.cpp \ 

  • trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk

    r10129 r11820  
    3737SYSMODS.freebsd      += vboxvfs 
    3838vboxvfs_TEMPLATE      = VBOXGUESTR0 
    39 vboxvfs_DEFS          = VBOX_HGCM 
     39vboxvfs_DEFS          = VBOX_WITH_HGCM 
    4040vboxvfs_INCS         := \ 
    4141       $(PATH_SUB_CURRENT) \ 

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

    r10129 r11820  
    6565vboxadd_NOINST   = 1 
    6666vboxadd_DEFS     = \ 
    67         MODULE IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM \ 
     67        MODULE IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_WITH_HGCM \ 
    6868        KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \ 
    6969        KBUILD_BASENAME=KBUILD_STR\(vboxadd\) 

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

    r10129 r11820  
    6868vboxvfs_CFLAGS          = -fshort-wchar 
    6969vboxvfs_DEFS            = \ 
    70         MODULE IN_RT_R0 VBOXGUEST VBOX_HGCM \ 
     70        MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \ 
    7171        KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \ 
    7272        KBUILD_BASENAME=KBUILD_STR\(vboxadd\) 

  • trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk

    r8760 r11820  
    1212VBoxSF_SYSSUFF       = .ifs 
    1313VBoxSF_DLLSUFF       = .ifs 
    14 VBoxSF_DEFS          = VBOX_HGCM 
     14VBoxSF_DEFS          = VBOX_WITH_HGCM 
    1515VBoxSF_INCS         := \ 
    1616        $(PATH_SUB_CURRENT) \ 

  • trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

    r10307 r11820  
    2828SYSMODS.solaris      += vboxvfs 
    2929vboxvfs_TEMPLATE      = VBOXGUESTR0 
    30 vboxvfs_DEFS          = VBOX_HGCM 
     30vboxvfs_DEFS          = VBOX_WITH_HGCM 
    3131vboxvfs_INCS         := \ 
    3232       $(PATH_SUB_CURRENT) \ 

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

    r10653 r11820  
    3434 
    3535VBoxClient_TEMPLATE = VBOXGUESTR3CPPEXE 
    36 VBoxClient_DEFS += VBOX_X11_CLIPBOARD VBOX_HGCM 
     36VBoxClient_DEFS += VBOX_X11_CLIPBOARD VBOX_WITH_HGCM 
    3737VBoxClient_DEFS.linux += _GNU_SOURCE 
    3838VBoxClient_SOURCES = \ 

  • trunk/src/VBox/Devices/Makefile.kmk

    r11805 r11820  
    3030include $(PATH_SUB_CURRENT)/PC/BIOS/Makefile.kmk 
    3131ifndef VBOX_OSE # not yet 
    32  include $(PATH_SUB_CURRENT)/PC/VMI/Makefile.kmk 
     32# include $(PATH_SUB_CURRENT)/PC/VMI/Makefile.kmk 
    3333endif 
    3434include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk 
    …… 
    331331endif 
    332332 
    333 DevicesR3_DEFS         += VBOX_HGCM 
     333DevicesR3_DEFS         += VBOX_WITH_HGCM 
    334334DevicesR3_DEFS.linux   += _GNU_SOURCE 
    335335DevicesR3_DEFS.l4      += _GNU_SOURCE 
    …… 
    795795        USB/VUSBUrb.cpp 
    796796 ifdef VBOX_WITH_VRDP 
    797   Drivers_DEFS        += VBOX_VRDP 
     797  Drivers_DEFS        += VBOX_WITH_VRDP 
    798798  Drivers_SOURCES     += \ 
    799799        USB/vrdp/USBProxyDevice-vrdp.cpp 

  • trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

    r11285 r11820  
    4545 
    4646#include "VMMDevState.h" 
    47 #ifdef VBOX_HGCM 
     47#ifdef VBOX_WITH_HGCM 
    4848# include "VMMDevHGCM.h" 
    4949#endif 
    …… 
    10141014        } 
    10151015 
    1016 #ifdef VBOX_HGCM 
     1016#ifdef VBOX_WITH_HGCM 
    10171017        /* 
    10181018         * Process HGCM request 
    …… 
    10971097            break; 
    10981098        } 
    1099 #endif /* VBOX_HGCM */ 
     1099#endif /* VBOX_WITH_HGCM */ 
    11001100 
    11011101        case VMMDevReq_HGCMCancel: 
    …… 
    16841684        case PDMINTERFACE_VMMDEV_PORT: 
    16851685            return &pThis->Port; 
    1686 #ifdef VBOX_HGCM 
     1686#ifdef VBOX_WITH_HGCM 
    16871687        case PDMINTERFACE_HGCM_PORT: 
    16881688            return &pThis->HGCMPort; 
    …… 
    20112011    SSMR3PutU32(pSSMHandle, pThis->guestCaps); 
    20122012 
    2013 #ifdef VBOX_HGCM 
     2013#ifdef VBOX_WITH_HGCM 
    20142014    vmmdevHGCMSaveState (pThis, pSSMHandle); 
    2015 #endif /* VBOX_HGCM */ 
     2015#endif /* VBOX_WITH_HGCM */ 
    20162016 
    20172017    return VINF_SUCCESS; 
    …… 
    20622062    } 
    20632063 
    2064 #ifdef VBOX_HGCM 
     2064#ifdef VBOX_WITH_HGCM 
    20652065    vmmdevHGCMLoadState (pThis, pSSMHandle); 
    2066 #endif /* VBOX_HGCM */ 
     2066#endif /* VBOX_WITH_HGCM */ 
    20672067 
    20682068    /* 
    …… 
    21062106    VMMDevState *pThis = PDMINS_2_DATA(pDevIns, VMMDevState*); 
    21072107 
    2108 #ifdef VBOX_HGCM 
     2108#ifdef VBOX_WITH_HGCM 
    21092109    vmmdevHGCMLoadStateDone (pThis, pSSMHandle); 
    2110 #endif /* VBOX_HGCM */ 
     2110#endif /* VBOX_WITH_HGCM */ 
    21112111 
    21122112    VMMDevNotifyGuest (pThis, VMMDEV_EVENT_RESTORED); 
    …… 
    22122212    pThis->SharedFolders.ILeds.pfnQueryStatusLed = vmmdevQueryStatusLed; 
    22132213 
    2214 #ifdef VBOX_HGCM 
     2214#ifdef VBOX_WITH_HGCM 
    22152215    /* HGCM port */ 
    22162216    pThis->HGCMPort.pfnCompleted          = hgcmCompleted; 
    …… 
    22672267        if (!pThis->pDrv) 
    22682268            AssertMsgFailedReturn(("LUN #0 doesn't have a VMMDev connector interface!\n"), VERR_PDM_MISSING_INTERFACE); 
    2269 #ifdef VBOX_HGCM 
     2269#ifdef VBOX_WITH_HGCM 
    22702270        pThis->pHGCMDrv = (PPDMIHGCMCONNECTOR)pThis->pDrvBase->pfnQueryInterface(pThis->pDrvBase, PDMINTERFACE_HGCM_CONNECTOR); 
    22712271        if (!pThis->pHGCMDrv) 
    …… 
    23062306    AssertRCReturn(rc, rc); 
    23072307 
    2308 #ifdef VBOX_HGCM 
     2308#ifdef VBOX_WITH_HGCM 
    23092309    pThis->pHGCMCmdList = NULL; 
    23102310    rc = RTCritSectInit(&pThis->critsectHGCMCmdList); 
    23112311    AssertRCReturn(rc, rc); 
    23122312    pThis->u32HGCMEnabled = 0; 
    2313 #endif /* VBOX_HGCM */ 
     2313#endif /* VBOX_WITH_HGCM */ 
    23142314 
    23152315    return rc; 

  • trunk/src/VBox/Devices/VMMDev/VMMDevState.h

    r11282 r11820  
    5353    /** VMMDev port interface. */ 
    5454    PDMIVMMDEVPORT Port; 
    55 #ifdef VBOX_HGCM 
     55#ifdef VBOX_WITH_HGCM 
    5656    /** HGCM port interface. */ 
    5757    PDMIHGCMPORT HGCMPort; 
    …… 
    6161    /** VMMDev connector interface */ 
    6262    R3PTRTYPE(PPDMIVMMDEVCONNECTOR) pDrv; 
    63 #ifdef VBOX_HGCM 
     63#ifdef VBOX_WITH_HGCM 
    6464    /** HGCM connector interface */ 
    6565    R3PTRTYPE(PPDMIHGCMCONNECTOR) pHGCMDrv; 
    …… 
    165165    bool fKeepCredentials; 
    166166 
    167 #ifdef VBOX_HGCM 
     167#ifdef VBOX_WITH_HGCM 
    168168    /** List of pending HGCM requests, used for saving the HGCM state. */ 
    169169    R3PTRTYPE(PVBOXHGCMCMD) pHGCMCmdList; 
    …… 
    172172    /** Whether the HGCM events are already automatically enabled. */ 
    173173    uint32_t u32HGCMEnabled; 
    174 #endif /* VBOX_HGCM */ 
     174#endif /* VBOX_WITH_HGCM */ 
    175175 
    176176    /* Shared folders LED */ 

  • trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

    r11727 r11820  
    5757#endif 
    5858ifdef VBOX_WITH_VRDP 
    59 VBoxBFE_DEFS += VBOX_VRDP 
     59VBoxBFE_DEFS += VBOX_WITH_VRDP 
    6060endif 
    6161ifneq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COM),win.) 
    …… 
    8585 
    8686ifdef VBOX_WITH_HGCM 
    87 VBoxBFE_DEFS += VBOX_HGCM 
     87VBoxBFE_DEFS += VBOX_WITH_HGCM 
    8888VBoxBFE_SOURCES += \ 
    8989        HGCM.cpp \ 

  • trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

    r11725 r11820  
    4646# include <VBox/vusb.h> 
    4747#endif 
    48 #ifdef VBOX_HGCM 
     48#ifdef VBOX_WITH_HGCM 
    4949# include <VBox/shflsvc.h> 
    5050#endif 
    …… 
    392392             "  -tapfd<1-N> <fd>   Use existing TAP device, don't allocate\n" 
    393393#endif 
    394 #ifdef VBOX_VRDP 
     394#ifdef VBOX_WITH_VRDP 
    395395             "  -vrdp [port]       Listen for VRDP connections on port (default if not specified)\n" 
    396396#endif 
    …… 
    418418{ 
    419419    bool fFullscreen = false; 
    420 #ifdef VBOX_VRDP 
     420#ifdef VBOX_WITH_VRDP 
    421421    int32_t portVRDP = -1; 
    422422#endif 
    …… 
    713713        } 
    714714#endif /* RT_OS_LINUX */ 
    715 #ifdef VBOX_VRDP 
     715#ifdef VBOX_WITH_VRDP 
    716716        else if (strcmp(pszArg, "-vrdp") == 0) 
    717717        { 
    …… 
    727727            } 
    728728        } 
    729 #endif /* VBOX_VRDP */ 
     729#endif /* VBOX_WITH_VRDP */ 
    730730#ifdef VBOX_SECURELABEL 
    731731        else if (strcmp(pszArg, "-securelabel") == 0) 
    …… 
    11851185    } 
    11861186 
    1187 #ifdef VBOX_HGCM 
     1187#ifdef VBOX_WITH_HGCM 
    11881188    /* 
    11891189     * Add shared folders to the VM 

  • trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

    r11307 r11820  
    4242#include "DisplayImpl.h" 
    4343#include "ConsoleImpl.h" 
    44 #ifdef VBOX_HGCM 
     44#ifdef VBOX_WITH_HGCM 
    4545#include "HGCM.h" 
    4646#endif 
    …… 
    6969    PDMIVMMDEVCONNECTOR         Connector; 
    7070 
    71 #ifdef VBOX_HGCM 
     71#ifdef VBOX_WITH_HGCM 
    7272    /** Pointer to the HGCM port interface of the driver/device above us. */ 
    7373    PPDMIHGCMPORT               pHGCMPort; 
    …… 
    8080#define PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, Connector)) ) 
    8181 
    82 #ifdef VBOX_HGCM 
     82#ifdef VBOX_WITH_HGCM 
    8383/** Converts PDMIHGCMCONNECTOR pointer to a DRVMAINVMMDEV pointer. */ 
    8484#define PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, HGCMConnector)) ) 
    …… 
    8787VMMDev::VMMDev() : mpDrv(NULL) 
    8888{ 
    89 #ifdef VBOX_HGCM 
     89#ifdef VBOX_WITH_HGCM 
    9090    int rc = VINF_SUCCESS; 
    9191    if (fActivateHGCM()) 
    …… 
    9797VMMDev::~VMMDev() 
    9898{ 
    99 #ifdef VBOX_HGCM 
     99#ifdef VBOX_WITH_HGCM 
    100100    if (fActivateHGCM()) 
    101101        HGCMHostShutdown (); 
    102 #endif /* VBOX_HGCM */ 
     102#endif /* VBOX_WITH_HGCM */ 
    103103} 
    104104 
    …… 
    259259} 
    260260 
    261 #ifdef VBOX_HGCM 
     261#ifdef VBOX_WITH_HGCM 
    262262 
    263263/* HGCM connector interface */ 
    …… 
    360360        case PDMINTERFACE_VMMDEV_CONNECTOR: 
    361361            return &pDrv->Connector; 
    362 #ifdef VBOX_HGCM 
     362#ifdef VBOX_WITH_HGCM 
    363363        case PDMINTERFACE_HGCM_CONNECTOR: 
    364364            if (fActivateHGCM()) 
    …… 
    430430    pData->Connector.pfnQueryVisibleRegion      = iface_QueryVisibleRegion; 
    431431 
    432 #ifdef VBOX_HGCM 
     432#ifdef VBOX_WITH_HGCM 
    433433    if (fActivateHGCM()) 
    434434    { 
    …… 
    449449    } 
    450450 
    451 #ifdef VBOX_HGCM 
     451#ifdef VBOX_WITH_HGCM 
    452452    if (fActivateHGCM()) 
    453453    { 
    …… 
    475475    pData->pVMMDev->mpDrv = pData; 
    476476 
    477 #ifdef VBOX_HGCM 
     477#ifdef VBOX_WITH_HGCM 
    478478    if (fActivateHGCM()) 
    479479    { 
    …… 
    487487        pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, "HGCM", 0, HGCM_SSM_VERSION, 4096/* bad guess */, NULL, iface_hgcmSave, NULL, NULL, iface_hgcmLoad, NULL); 
    488488    } 
    489 #endif /* VBOX_HGCM */ 
     489#endif /* VBOX_WITH_HGCM */ 
    490490 
    491491    return VINF_SUCCESS; 

  • trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

    r11703 r11820  
    3939else # !VBOX_ONLY_DOCS 
    4040