VirtualBox

Changeset 11820 in vbox for trunk/src


Ignore:
Timestamp:
Aug 29, 2008 2:09:39 PM (16 years ago)
Author:
vboxsync
Message:

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

Location:
trunk/src/VBox
Files:
47 edited

Legend:

Unmodified
Added
Removed

  • 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 VBoxManage_TEMPLATE   = VBOXMAINCLIENTEXE
    41  VBoxManage_DEFS      += $(if $(VBOX_WITH_VRDP),VBOX_VRDP,) \
     41 VBoxManage_DEFS      += $(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
    4242                         $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
    4343                         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \

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

    r11765 r11820  
    253253    bool fDarwin = false;
    254254#endif
    255 #ifdef VBOX_VRDP
     255#ifdef VBOX_WITH_VRDP
    256256    bool fVRDP = true;
    257257#else
    … …  
    37793779    char *audiocontroller = NULL;
    37803780    char *clipboard = NULL;
    3781 #ifdef VBOX_VRDP
     3781#ifdef VBOX_WITH_VRDP
    37823782    char *vrdp = NULL;
    37833783    uint16_t vrdpport = UINT16_MAX;
    … …  
    41994199            i++;
    42004200        }
    4201 #ifdef VBOX_VRDP
     4201#ifdef VBOX_WITH_VRDP
    42024202        else if (strcmp(argv[i], "-vrdp") == 0)
    42034203        {
    … …  
    42384238            vrdpmulticon = argv[i];
    42394239        }
    4240 #endif /* VBOX_VRDP */
     4240#endif /* VBOX_WITH_VRDP */
    42414241        else if (strcmp(argv[i], "-usb") == 0)
    42424242        {
    … …  
    53245324            break;
    53255325
    5326 #ifdef VBOX_VRDP
     5326#ifdef VBOX_WITH_VRDP
    53275327        if (vrdp || (vrdpport != UINT16_MAX) || vrdpaddress || vrdpauthtype || vrdpmulticon)
    53285328        {
    … …  
    53975397            }
    53985398        }
    5399 #endif /* VBOX_VRDP */
     5399#endif /* VBOX_WITH_VRDP */
    54005400
    54015401        /*

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

    r11728 r11820  
    7777endif
    7878ifdef VBOX_WITH_VRDP
    79  VBoxSDL_DEFS     += VBOX_VRDP
     79 VBoxSDL_DEFS     += VBOX_WITH_VRDP
    8080endif
    8181VBoxSDL_DEFS.freebsd = VBOXSDL_WITH_X11

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

    r11725 r11820  
    672672             "  -evdevkeymap             Use evdev keycode map\n"
    673673#endif
    674 #ifdef VBOX_VRDP
     674#ifdef VBOX_WITH_VRDP
    675675             "  -vrdp <port>             Listen for VRDP connections on port (default if not specified)\n"
    676676#endif
    … …  
    10361036    char *cdromFile = NULL;
    10371037    char *fdaFile   = NULL;
    1038 #ifdef VBOX_VRDP
     1038#ifdef VBOX_WITH_VRDP
    10391039    int portVRDP = ~0;
    10401040#endif
    … …  
    14501450        }
    14511451#endif /* RT_OS_LINUX || RT_OS_DARWIN */
    1452 #ifdef VBOX_VRDP
     1452#ifdef VBOX_WITH_VRDP
    14531453        else if (strcmp(argv[curArg], "-vrdp") == 0)
    14541454        {
    … …  
    14691469            }
    14701470        }
    1471 #endif /* VBOX_VRDP */
     1471#endif /* VBOX_WITH_VRDP */
    14721472        else if (strcmp(argv[curArg], "-discardstate") == 0)
    14731473        {
    … …  
    20552055#endif /* RT_OS_LINUX || RT_OS_DARWIN */
    20562056
    2057 #ifdef VBOX_VRDP
     2057#ifdef VBOX_WITH_VRDP
    20582058    if (portVRDP != ~0)
    20592059    {
    … …  
    27912791#endif /* VBOX_WITH_XPCOM */
    27922792
    2793 #ifdef VBOX_VRDP
     2793#ifdef VBOX_WITH_VRDP
    27942794    if (gVrdpServer)
    27952795        rc = gVrdpServer->COMSETTER(Enabled)(FALSE);

  • trunk/src/VBox/HostServices/GuestProperties/Makefile.kmk

    r11725 r11820  
    3434VBoxGuestPropSvc_TEMPLATE  = VBOXR3
    3535VBoxGuestPropSvc_NAME.os2  = VBoxSIS
    36 VBoxGuestPropSvc_DEFS      = VBOX_HGCM
     36VBoxGuestPropSvc_DEFS      = VBOX_WITH_HGCM
    3737VBoxGuestPropSvc_INCS      = $(PATH_ROOT)/src/VBox/Main/include
    3838VBoxGuestPropSvc_INCS.win  = \

  • trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

    r11725 r11820  
    3333DLLS += VBoxSharedClipboard
    3434VBoxSharedClipboard_TEMPLATE  = VBOXR3
    35 VBoxSharedClipboard_DEFS      = VBOX_HGCM
     35VBoxSharedClipboard_DEFS      = VBOX_WITH_HGCM
    3636VBoxSharedClipboard_INCS.win  = \
    3737        $(VBOX_PATH_SDK)

  • trunk/src/VBox/HostServices/SharedFolders/Makefile.kmk

    r11725 r11820  
    3737VBoxSharedFolders_TEMPLATE  = VBOXR3
    3838VBoxSharedFolders_NAME.os2  = VBoxSFld
    39 VBoxSharedFolders_DEFS      = VBOX_HGCM RTSHFL
     39VBoxSharedFolders_DEFS      = VBOX_WITH_HGCM RTSHFL
    4040VBoxSharedFolders_INCS.win  = \
    4141        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \

  • trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

    r11733 r11820  
    3131TESTING  += $(PATH_TARGET)/tstShflSizes.run
    3232tstShflSizes_TEMPLATE = VBOXR3AUTOTST
    33 tstShflSizes_DEFS     = VBOX_HGCM
     33tstShflSizes_DEFS     = VBOX_WITH_HGCM
    3434tstShflSizes_SOURCES  = tstShflSizes.cpp
    3535
    … …  
    4141
    4242tstShflCase_TEMPLATE = VBOXR3TSTEXE
    43 tstShflCase_DEFS     = VBOX_HGCM
     43tstShflCase_DEFS     = VBOX_WITH_HGCM
    4444tstShflCase_SOURCES  = tstShflCase.cpp
    4545tstShflCase_LIBS     = $(LIB_RUNTIME)

  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r10051 r11820  
    3333DLLS += VBoxSharedOpenGL
    3434VBoxSharedOpenGL_TEMPLATE  = VBOXR3
    35 VBoxSharedOpenGL_DEFS      = VBOX_HGCM VBOX_OGL_HOST_SIDE
     35VBoxSharedOpenGL_DEFS      = VBOX_WITH_HGCM VBOX_OGL_HOST_SIDE
    3636VBoxSharedOpenGL_INCS.win  = \
    3737        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \

  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r11354 r11820  
    285285    AssertComRCReturnRC (rc);
    286286
    287 #ifdef VBOX_VRDP
     287#ifdef VBOX_WITH_VRDP
    288288    rc = mMachine->COMGETTER(VRDPServer) (unconst (mVRDPServer).asOutParam());
    289289    AssertComRCReturnRC (rc);
    … …  
    447447    unconst (mFloppyDrive).setNull();
    448448    unconst (mDVDDrive).setNull();
    449 #ifdef VBOX_VRDP
     449#ifdef VBOX_WITH_VRDP
    450450    unconst (mVRDPServer).setNull();
    451451#endif
    … …  
    645645    AssertComRCReturnVoid (autoCaller.rc());
    646646
    647 #ifdef VBOX_VRDP
     647#ifdef VBOX_WITH_VRDP
    648648    uint32_t u32Clients = ASMAtomicIncU32(&mcVRDPClients);
    649649
    … …  
    657657    NOREF(u32ClientId);
    658658    mDisplay->VideoAccelVRDP (true);
    659 #endif /* VBOX_VRDP */
     659#endif /* VBOX_WITH_VRDP */
    660660
    661661    LogFlowFuncLeave();
    … …  
    673673    AssertReturnVoid (mConsoleVRDPServer);
    674674
    675 #ifdef VBOX_VRDP
     675#ifdef VBOX_WITH_VRDP
    676676    uint32_t u32Clients = ASMAtomicDecU32(&mcVRDPClients);
    677677
    … …  
    684684
    685685    mDisplay->VideoAccelVRDP (false);
    686 #endif /* VBOX_VRDP */
     686#endif /* VBOX_WITH_VRDP */
    687687
    688688    if (fu32Intercepted & VRDP_CLIENT_INTERCEPT_USB)
    … …  
    691691    }
    692692
    693 #ifdef VBOX_VRDP
     693#ifdef VBOX_WITH_VRDP
    694694    if (fu32Intercepted & VRDP_CLIENT_INTERCEPT_CLIPBOARD)
    695695    {
    … …  
    713713        }
    714714    }
    715 #endif /* VBOX_VRDP */
     715#endif /* VBOX_WITH_VRDP */
    716716
    717717    Guid uuid;
    … …  
    741741    NOREF(u32ClientId);
    742742
    743 #ifdef VBOX_VRDP
     743#ifdef VBOX_WITH_VRDP
    744744    mcAudioRefs++;
    745745
    … …  
    785785    AssertReturnVoid (mConsoleVRDPServer);
    786786
    787 #ifdef VBOX_VRDP
     787#ifdef VBOX_WITH_VRDP
    788788    mConsoleVRDPServer->ClipboardCreate (u32ClientId);
    789 #endif /* VBOX_VRDP */
     789#endif /* VBOX_WITH_VRDP */
    790790
    791791    LogFlowFuncLeave();
    … …  
    43404340
    43414341
    4342 #ifdef VBOX_HGCM
     4342#ifdef VBOX_WITH_HGCM
    43434343    /*
    43444344     *  Shutdown HGCM services before stopping the guest, because they might need a cleanup.
    … …  
    44054405                                      ComSafeArrayAsInParam (flags));
    44064406# endif /* VBOX_WITH_GUEST_PROPS defined */
    4407 #endif /* VBOX_HGCM */
     4407#endif /* VBOX_WITH_HGCM */
    44084408
    44094409    /* First, wait for all mpVM callers to finish their work if necessary */
    … …  
    62086208    do
    62096209    {
    6210 #ifdef VBOX_VRDP
     6210#ifdef VBOX_WITH_VRDP
    62116211        /* Create the VRDP server. In case of headless operation, this will
    62126212         * also create the framebuffer, required at VM creation.
    … …  
    62476247            break;
    62486248        }
    6249 #endif /* VBOX_VRDP */
     6249#endif /* VBOX_WITH_VRDP */
    62506250
    62516251        /*
    … …  
    62656265        alock.enter();
    62666266
    6267 #ifdef VBOX_VRDP
     6267#ifdef VBOX_WITH_VRDP
    62686268        /* Enable client connections to the server. */
    62696269        console->consoleVRDPServer()->EnableConnections ();
    6270 #endif /* VBOX_VRDP */
     6270#endif /* VBOX_WITH_VRDP */
    62716271
    62726272        if (VBOX_SUCCESS (vrc))

  • trunk/src/VBox/Main/ConsoleVRDPServer.cpp

    r8155 r11820  
    3535
    3636#include <VBox/err.h>
    37 #ifdef VBOX_VRDP
     37#ifdef VBOX_WITH_VRDP
    3838#include <VBox/VRDPOrders.h>
    39 #endif /* VBOX_VRDP */
     39#endif /* VBOX_WITH_VRDP */
    4040
    4141class VRDPConsoleCallback : public IConsoleCallback
    … …  
    579579////////////////////////////////////////////////////////////////////////////////
    580580
    581 #ifdef VBOX_VRDP
     581#ifdef VBOX_WITH_VRDP
    582582RTLDRMOD ConsoleVRDPServer::mVRDPLibrary;
    583583
    … …  
    10071007    server->mConsole->getDisplay ()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId);
    10081008}
    1009 #endif /* VBOX_VRDP */
     1009#endif /* VBOX_WITH_VRDP */
    10101010
    10111011ConsoleVRDPServer::ConsoleVRDPServer (Console *console)
    … …  
    10281028#endif
    10291029
    1030 #ifdef VBOX_VRDP
     1030#ifdef VBOX_WITH_VRDP
    10311031    mhServer = 0;
    10321032
    … …  
    10511051    mConsoleCallback->AddRef();
    10521052    console->RegisterCallback(mConsoleCallback);
    1053 #endif /* VBOX_VRDP */
     1053#endif /* VBOX_WITH_VRDP */
    10541054
    10551055    mAuthLibrary = 0;
    … …  
    10601060    Stop ();
    10611061
    1062 #ifdef VBOX_VRDP
     1062#ifdef VBOX_WITH_VRDP
    10631063    if (mConsoleCallback)
    10641064    {
    … …  
    10771077        }
    10781078    }
    1079 #endif /* VBOX_VRDP */
     1079#endif /* VBOX_WITH_VRDP */
    10801080
    10811081    if (RTCritSectIsInitialized (&mCritSect))
    … …  
    10891089{
    10901090    LogFlowMember(("ConsoleVRDPServer::Launch\n"));
    1091 #ifdef VBOX_VRDP
     1091#ifdef VBOX_WITH_VRDP
    10921092    int rc = VINF_SUCCESS;
    10931093    IVRDPServer *vrdpserver = mConsole->getVRDPServer ();
    … …  
    11221122    int rc = VERR_NOT_SUPPORTED;
    11231123    LogRel(("VRDP: this version does not include the VRDP server.\n"));
    1124 #endif /* VBOX_VRDP */
     1124#endif /* VBOX_WITH_VRDP */
    11251125    return rc;
    11261126}
    … …  
    11281128void ConsoleVRDPServer::EnableConnections (void)
    11291129{
    1130 #ifdef VBOX_VRDP
     1130#ifdef VBOX_WITH_VRDP
    11311131    if (mpEntryPoints && mhServer)
    11321132    {
    11331133        mpEntryPoints->VRDPEnableConnections (mhServer, true);
    11341134    }
    1135 #endif /* VBOX_VRDP */
     1135#endif /* VBOX_WITH_VRDP */
    11361136}
    11371137
    11381138void ConsoleVRDPServer::MousePointerUpdate (const VRDPCOLORPOINTER *pPointer)
    11391139{
    1140 #ifdef VBOX_VRDP
     1140#ifdef VBOX_WITH_VRDP
    11411141    if (mpEntryPoints && mhServer)
    11421142    {
    11431143        mpEntryPoints->VRDPColorPointer (mhServer, pPointer);
    11441144    }
    1145 #endif /* VBOX_VRDP */
     1145#endif /* VBOX_WITH_VRDP */
    11461146}
    11471147
    11481148void ConsoleVRDPServer::MousePointerHide (void)
    11491149{
    1150 #ifdef VBOX_VRDP
     1150#ifdef VBOX_WITH_VRDP
    11511151    if (mpEntryPoints && mhServer)
    11521152    {
    11531153        mpEntryPoints->VRDPHidePointer (mhServer);
    11541154    }
    1155 #endif /* VBOX_VRDP */
     1155#endif /* VBOX_WITH_VRDP */
    11561156}
    11571157
    … …  
    11601160    Assert(VALID_PTR(this)); /** @todo r=bird: there are(/was) some odd cases where this buster was invalid on
    11611161                              * linux. Just remove this when it's 100% sure that problem has been fixed. */
    1162 #ifdef VBOX_VRDP
     1162#ifdef VBOX_WITH_VRDP
    11631163    if (mhServer)
    11641164    {
    … …  
    11731173        }
    11741174    }
    1175 #endif /* VBOX_VRDP */
     1175#endif /* VBOX_WITH_VRDP */
    11761176
    11771177#ifdef VBOX_WITH_USB
    … …  
    14991499    int rc = VINF_SUCCESS;
    15001500
    1501 #ifdef VBOX_VRDP
     1501#ifdef VBOX_WITH_VRDP
    15021502    ConsoleVRDPServer *pServer = static_cast <ConsoleVRDPServer *>(pvExtension);
    15031503
    … …  
    15581558            rc = VERR_NOT_SUPPORTED;
    15591559    }
    1560 #endif /* VBOX_VRDP */
     1560#endif /* VBOX_WITH_VRDP */
    15611561
    15621562    return rc;
    … …  
    18581858void ConsoleVRDPServer::SendUpdate (unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate) const
    18591859{
    1860 #ifdef VBOX_VRDP
     1860#ifdef VBOX_WITH_VRDP
    18611861    if (mpEntryPoints && mhServer)
    18621862    {
    … …  
    18681868void ConsoleVRDPServer::SendResize (void) const
    18691869{
    1870 #ifdef VBOX_VRDP
     1870#ifdef VBOX_WITH_VRDP
    18711871    if (mpEntryPoints && mhServer)
    18721872    {
    … …  
    18781878void ConsoleVRDPServer::SendUpdateBitmap (unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h) const
    18791879{
    1880 #ifdef VBOX_VRDP
     1880#ifdef VBOX_WITH_VRDP
    18811881    VRDPORDERHDR update;
    18821882    update.x = x;
    … …  
    18931893void ConsoleVRDPServer::SendAudioSamples (void *pvSamples, uint32_t cSamples, VRDPAUDIOFORMAT format) const
    18941894{
    1895 #ifdef VBOX_VRDP
     1895#ifdef VBOX_WITH_VRDP
    18961896    if (mpEntryPoints && mhServer)
    18971897    {
    … …  
    19031903void ConsoleVRDPServer::SendAudioVolume (uint16_t left, uint16_t right) const
    19041904{
    1905 #ifdef VBOX_VRDP
     1905#ifdef VBOX_WITH_VRDP
    19061906    if (mpEntryPoints && mhServer)
    19071907    {
    … …  
    19131913void ConsoleVRDPServer::SendUSBRequest (uint32_t u32ClientId, void *pvParms, uint32_t cbParms) const
    19141914{
    1915 #ifdef VBOX_VRDP
     1915#ifdef VBOX_WITH_VRDP
    19161916    if (mpEntryPoints && mhServer)
    19171917    {
    … …  
    19231923void ConsoleVRDPServer::QueryInfo (uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) const
    19241924{
    1925 #ifdef VBOX_VRDP
     1925#ifdef VBOX_WITH_VRDP
    19261926    if (mpEntryPoints && mhServer)
    19271927    {
    … …  
    19311931}
    19321932
    1933 #ifdef VBOX_VRDP
     1933#ifdef VBOX_WITH_VRDP
    19341934/* note: static function now! */
    19351935bool ConsoleVRDPServer::loadVRDPLibrary (void)
    … …  
    19911991    return (mVRDPLibrary != NULL);
    19921992}
    1993 #endif /* VBOX_VRDP */
     1993#endif /* VBOX_WITH_VRDP */
    19941994
    19951995/*

  • trunk/src/VBox/Main/DisplayImpl.cpp

    r11296 r11820  
    786786}
    787787
    788 #ifdef VBOX_VRDP
     788#ifdef VBOX_WITH_VRDP
    789789/* Called always by one VRDP server thread. Can be thread-unsafe.
    790790 */
    … …  
    834834    }
    835835}
    836 #endif /* VBOX_VRDP */
     836#endif /* VBOX_WITH_VRDP */
    837837
    838838static bool vbvaVerifyRingBuffer (VBVAMEMORY *pVbvaMemory)

  • trunk/src/VBox/Main/MachineImpl.cpp

    r11699 r11820  
    12751275STDMETHODIMP Machine::COMGETTER(VRDPServer)(IVRDPServer **vrdpServer)
    12761276{
    1277 #ifdef VBOX_VRDP
     1277#ifdef VBOX_WITH_VRDP
    12781278    if (!vrdpServer)
    12791279        return E_POINTER;
    … …  
    36243624
    36253625    Bstr type (aType);
    3626     if (type == "gui" || type == "GUI/Qt3")
    3627     {
    3628 #ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
    3629         const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM3";
    3630 #else
    3631         const char VirtualBox_exe[] = "VirtualBox3" HOSTSUFF_EXE;
    3632 #endif
     3626
     3627    /* Qt4 is default */
     3628#ifdef VBOX_WITH_QT4GUI
     3629    if (type == "gui" || type == "GUI/Qt4")
     3630    {
     3631# ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
     3632        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
     3633# else
     3634        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
     3635# endif
    36333636        Assert (sz >= sizeof (VirtualBox_exe));
    36343637        strcpy (cmd, VirtualBox_exe);
    36353638
    36363639        Utf8Str idStr = mData->mUuid.toString();
    3637 #ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
     3640# ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
    36383641        const char * args[] = {path, "-startvm", idStr, 0 };
    3639 #else
     3642# else
    36403643        Utf8Str name = mUserData->mName;
    36413644        const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
    3642 #endif
     3645# endif
    36433646        vrc = RTProcCreate (path, args, env, 0, &pid);
    36443647    }
     3648#else /* !VBOX_WITH_QT4GUI */
     3649    if (0)
     3650        ;
     3651#endif /* VBOX_WITH_QT4GUI */
     3652
    36453653    else
    3646     if (type == "GUI/Qt4")
    3647     {
    3648 #ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
    3649         const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
    3650 #else
    3651         const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
    3652 #endif
     3654
     3655    /* Qt3 is used sometimes as well, OS/2 does not have Qt4 at all */
     3656#ifdef VBOX_WITH_QTGUI
     3657    if (type == "gui" || type == "GUI/Qt3")
     3658    {
     3659# ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
     3660        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM3";
     3661# else
     3662        const char VirtualBox_exe[] = "VirtualBox3" HOSTSUFF_EXE;
     3663# endif
    36533664        Assert (sz >= sizeof (VirtualBox_exe));
    36543665        strcpy (cmd, VirtualBox_exe);
    36553666
    36563667        Utf8Str idStr = mData->mUuid.toString();
    3657 #ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
     3668# ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
    36583669        const char * args[] = {path, "-startvm", idStr, 0 };
    3659 #else
     3670# else
    36603671        Utf8Str name = mUserData->mName;
    36613672        const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
    3662 #endif
     3673# endif
    36633674        vrc = RTProcCreate (path, args, env, 0, &pid);
    36643675    }
     3676#else /* !VBOX_WITH_QTGUI */
     3677    if (0)
     3678        ;
     3679#endif /* !VBOX_WITH_QTGUI */
     3680
    36653681    else
    3666 #ifdef VBOX_VRDP
     3682
     3683#ifdef VBOX_WITH_VRDP
    36673684    if (type == "vrdp")
    36683685    {
    … …  
    36723689
    36733690        Utf8Str idStr = mData->mUuid.toString();
    3674 #ifdef RT_OS_WINDOWS
     3691# ifdef RT_OS_WINDOWS
    36753692        const char * args[] = {path, "-startvm", idStr, 0 };
    3676 #else
     3693# else
    36773694        Utf8Str name = mUserData->mName;
    36783695        const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
    3679 #endif
     3696# endif
    36803697        vrc = RTProcCreate (path, args, env, 0, &pid);
    36813698    }
     3699#else /* !VBOX_WITH_VRDP */
     3700    if (0)
     3701        ;
     3702#endif /* !VBOX_WITH_VRDP */
     3703
    36823704    else
    3683 #endif /* VBOX_VRDP */
     3705
     3706#ifdef VBOX_WITH_HEADLESS
    36843707    if (type == "capture")
    36853708    {
    … …  
    36893712
    36903713        Utf8Str idStr = mData->mUuid.toString();
    3691 #ifdef RT_OS_WINDOWS
     3714# ifdef RT_OS_WINDOWS
    36923715        const char * args[] = {path, "-startvm", idStr, "-capture", 0 };
    3693 #else
     3716# else
    36943717        Utf8Str name = mUserData->mName;
    36953718        const char * args[] = {path, "-comment", name, "-startvm", idStr, "-capture", 0 };
    3696 #endif
     3719# endif
    36973720        vrc = RTProcCreate (path, args, env, 0, &pid);
    36983721    }
     3722#else /* !VBOX_WITH_HEADLESS */
     3723    if (0)
     3724        ;
     3725#endif /* !VBOX_WITH_HEADLESS */
    36993726    else
    37003727    {
    … …  
    41234150    mBIOSSettings->init (this);
    41244151
    4125 #ifdef VBOX_VRDP
     4152#ifdef VBOX_WITH_VRDP
    41264153    /* create an associated VRDPServer object (default is disabled) */
    41274154    unconst (mVRDPServer).createObject();
    … …  
    42524279    }
    42534280
    4254 #ifdef VBOX_VRDP
     4281#ifdef VBOX_WITH_VRDP
    42554282    if (mVRDPServer)
    42564283    {
    … …  
    48084835    }
    48094836
    4810 #ifdef VBOX_VRDP
     4837#ifdef VBOX_WITH_VRDP
    48114838    /* RemoteDisplay */
    48124839    rc = mVRDPServer->loadSettings (aNode);
    … …  
    61936220    }
    61946221
    6195 #ifdef VBOX_VRDP
     6222#ifdef VBOX_WITH_VRDP
    61966223    /* VRDP settings (optional) */
    61976224    rc = mVRDPServer->saveSettings (aNode);
    … …  
    72757302        mHWData.isBackedUp() ||
    72767303        mHDData.isBackedUp() ||
    7277 #ifdef VBOX_VRDP
     7304#ifdef VBOX_WITH_VRDP
    72787305        (mVRDPServer && mVRDPServer->isModified()) ||
    72797306#endif
    … …  
    73187345        /* ignore mHDData */
    73197346        //mHDData.hasActualChanges() ||
    7320 #ifdef VBOX_VRDP
     7347#ifdef VBOX_WITH_VRDP
    73217348        (mVRDPServer && mVRDPServer->isReallyModified()) ||
    73227349#endif
    … …  
    73947421        mBIOSSettings->rollback();
    73957422
    7396 #ifdef VBOX_VRDP
     7423#ifdef VBOX_WITH_VRDP
    73977424    if (mVRDPServer)
    73987425        vrdpChanged = mVRDPServer->rollback();
    … …  
    74957522
    74967523    mBIOSSettings->commit();
    7497 #ifdef VBOX_VRDP
     7524#ifdef VBOX_WITH_VRDP
    74987525    mVRDPServer->commit();
    74997526#endif
    … …  
    75617588
    75627589    mBIOSSettings->copyFrom (aThat->mBIOSSettings);
    7563 #ifdef VBOX_VRDP
     7590#ifdef VBOX_WITH_VRDP
    75647591    mVRDPServer->copyFrom (aThat->mVRDPServer);
    75657592#endif
    … …  
    78087835    unconst (mBIOSSettings).createObject();
    78097836    mBIOSSettings->init (this, aMachine->mBIOSSettings);
    7810 #ifdef VBOX_VRDP
     7837#ifdef VBOX_WITH_VRDP
    78117838    /* create another VRDPServer object that will be mutable */
    78127839    unconst (mVRDPServer).createObject();
    … …  
    1056610593    mBIOSSettings->initCopy (this, mPeer->mBIOSSettings);
    1056710594
    10568 #ifdef VBOX_VRDP
     10595#ifdef VBOX_WITH_VRDP
    1056910596    unconst (mVRDPServer).createObject();
    1057010597    mVRDPServer->initCopy (this, mPeer->mVRDPServer);
    … …  
    1066810695    mBIOSSettings->init (this);
    1066910696
    10670 #ifdef VBOX_VRDP
     10697#ifdef VBOX_WITH_VRDP
    1067110698    unconst (mVRDPServer).createObject();
    1067210699    mVRDPServer->init (this);

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

    r11811 r11820  
    133133#
    134134VBoxSVC_TEMPLATE = VBOXMAINEXE
    135 VBoxSVC_DEFS = VBOX_MAIN_SETTINGS_ADDONS $(VBOX_MAIN_DEFS)
    136 ifdef VBOX_WITH_VRDP
    137 VBoxSVC_DEFS += VBOX_VRDP
    138 endif
    139 ifdef VBOX_WITH_HGCM
    140 VBoxSVC_DEFS += VBOX_HGCM
    141 endif
    142 ifdef VBOX_MAIN_RELEASE_LOG
    143 VBoxSVC_DEFS += VBOX_MAIN_RELEASE_LOG LOG_ENABLED
    144 endif
     135VBoxSVC_DEFS = \
     136        VBOX_MAIN_SETTINGS_ADDONS \
     137        $(VBOX_MAIN_DEFS) \
     138        $(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
     139        $(if $(VBOX_WITH_HEADLESS),VBOX_WITH_HEADLESS,) \
     140        $(if $(VBOX_WITH_QTGUI),VBOX_WITH_QTGUI,) \
     141        $(if $(VBOX_WITH_QT4GUI),VBOX_WITH_QT4GUI,) \
     142        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
     143        $(if $(VBOX_MAIN_RELEASE_LOG),VBOX_MAIN_RELEASE_LOG LOG_ENABLED,) \
     144        $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
     145        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
     146        $(if $(VBOX_WITH_WINMM),VBOX_WITH_WINMM,) \
     147        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
     148        $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \
     149        $(if $(VBOX_WITHOUT_LINUX_COMPILER_H),VBOX_WITHOUT_LINUX_COMPILER_H,) \
     150        $(if $(VBOX_WITH_RESOURCE_USAGE_API),VBOX_WITH_RESOURCE_USAGE_API,)
     151
    145152ifdef VBOX_WITH_USB
    146 VBoxSVC_DEFS += VBOX_WITH_USB
    147  ifdef VBOX_WITH_EHCI
    148 VBoxSVC_DEFS += VBOX_WITH_EHCI
    149  endif
    150  ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
    151 VBoxSVC_DEFS += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
    152  endif
    153 endif
    154 ifdef VBOX_WITH_ALSA
    155 VBoxSVC_DEFS += VBOX_WITH_ALSA
    156 endif
    157 ifdef VBOX_WITH_PULSE
    158 VBoxSVC_DEFS += VBOX_WITH_PULSE
    159 endif
    160 ifdef VBOX_WITH_WINMM
    161 VBoxSVC_DEFS += VBOX_WITH_WINMM
    162 endif
    163 ifdef VBOX_WITH_E1000
    164 VBoxSVC_DEFS += VBOX_WITH_E1000
    165 endif
    166 ifdef VBOX_WITH_AHCI
    167 VBoxSVC_DEFS += VBOX_WITH_AHCI
    168 endif
    169 ifdef VBOX_WITHOUT_LINUX_COMPILER_H
    170 VBoxSVC_DEFS += VBOX_WITHOUT_LINUX_COMPILER_H
    171 endif
    172 ifdef VBOX_WITH_RESOURCE_USAGE_API
    173 VBoxSVC_DEFS += VBOX_WITH_RESOURCE_USAGE_API
    174 endif
     153VBoxSVC_DEFS += \
     154        VBOX_WITH_USB \
     155        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
     156        $(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
     157endif
     158
    175159
    176160VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
    … …  
    237221        SharedFolderImpl.cpp \
    238222        SystemPropertiesImpl.cpp \
    239         BIOSSettingsImpl.cpp
    240 
    241 ifdef VBOX_WITH_VRDP
    242 VBoxSVC_SOURCES += VRDPServerImpl.cpp
    243 endif
     223        BIOSSettingsImpl.cpp \
     224        $(if $(VBOX_WITH_VRDP),VRDPServerImpl.cpp,) \
     225        $(if $(VBOX_WITH_XPCOM),xpcom/server.cpp,)
    244226
    245227VBoxSVC_SOURCES.darwin = \
    … …  
    256238VBoxSVC_SOURCES.solaris = \
    257239        linux/vbox-libhal.cpp
    258 
    259 ifdef VBOX_WITH_XPCOM
    260 VBoxSVC_SOURCES += \
    261         xpcom/server.cpp
    262 endif
    263240
    264241ifdef VBOX_WITH_USB
    … …  
    334311#
    335312VBoxC_TEMPLATE = VBOXMAINCOMP
    336 VBoxC_DEFS = IN_RING3 $(VBOX_MAIN_DEFS)
    337 VBoxC_DEFS += VBOX_COM_INPROC
    338 
    339 ifdef VBOX_WITH_VRDP
    340 VBoxC_DEFS += VBOX_VRDP
    341 endif
    342 ifdef VBOX_WITH_HGCM
    343 VBoxC_DEFS += VBOX_HGCM
    344 endif
    345 ifdef VBOX_MAIN_RELEASE_LOG
    346 VBoxC_DEFS += VBOX_MAIN_RELEASE_LOG LOG_ENABLED
    347 endif
     313VBoxC_DEFS = \
     314        IN_RING3 \
     315        $(VBOX_MAIN_DEFS) \
     316        VBOX_COM_INPROC \
     317        $(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
     318        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
     319        $(if $(VBOX_MAIN_RELEASE_LOG),VBOX_MAIN_RELEASE_LOG LOG_ENABLED,) \
     320        $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
     321        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
     322        $(if $(VBOX_WITH_WINMM),VBOX_WITH_WINMM,) \
     323        $(if $(VBOX_WITH_CROSSBOW),VBOX_WITH_CROSSBOW,) \
     324        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,)
     325
    348326ifdef VBOX_WITH_USB
    349 VBoxC_DEFS += VBOX_WITH_USB
    350 ifdef VBOX_WITH_EHCI
    351 VBoxC_DEFS += VBOX_WITH_EHCI
    352 endif
    353 endif
    354 ifdef VBOX_WITH_ALSA
    355 VBoxC_DEFS += VBOX_WITH_ALSA
    356 endif
    357 ifdef VBOX_WITH_PULSE
    358 VBoxC_DEFS += VBOX_WITH_PULSE
    359 endif
    360 ifdef VBOX_WITH_WINMM
    361 VBoxC_DEFS += VBOX_WITH_WINMM
    362 endif
    363 ifdef VBOX_WITH_CROSSBOW
    364 VBoxC_DEFS += VBOX_WITH_CROSSBOW
    365 endif
    366 ifdef VBOX_WITH_E1000
    367 VBoxC_DEFS += VBOX_WITH_E1000
     327VBoxC_DEFS += \
     328        VBOX_WITH_USB \
     329        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,)
    368330endif
    369331
    … …  
    608570IDL_DEFS = /nologo
    609571ifdef VBOX_WITH_VRDP
    610  IDL_DEFS += /D VBOX_VRDP
     572 IDL_DEFS += /D VBOX_WITH_VRDP
    611573endif
    612574

  • trunk/src/VBox/Main/VMMDevInterface.cpp

    r11409 r11820  
    3333#include <iprt/asm.h>
    3434
    35 #ifdef VBOX_HGCM
     35#ifdef VBOX_WITH_HGCM
    3636#include "hgcm/HGCM.h"
    3737#include "hgcm/HGCMObjects.h"
    … …  
    6767    PDMIVMMDEVCONNECTOR         Connector;
    6868
    69 #ifdef VBOX_HGCM
     69#ifdef VBOX_WITH_HGCM
    7070    /** Pointer to the HGCM port interface of the driver/device above us. */
    7171    PPDMIHGCMPORT               pHGCMPort;
    … …  
    7878#define PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, Connector)) )
    7979
    80 #ifdef VBOX_HGCM
     80#ifdef VBOX_WITH_HGCM
    8181/** Converts PDMIHGCMCONNECTOR pointer to a DRVMAINVMMDEV pointer. */
    8282#define PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, HGCMConnector)) )
    … …  
    9191    int rc = RTSemEventCreate(&mCredentialsEvent);
    9292    AssertRC(rc);
    93 #ifdef VBOX_HGCM
     93#ifdef VBOX_WITH_HGCM
    9494    rc = HGCMHostInit ();
    9595    AssertRC(rc);
    9696    m_fHGCMActive = true;
    97 #endif /* VBOX_HGCM */
     97#endif /* VBOX_WITH_HGCM */
    9898    mu32CredentialsFlags = 0;
    9999}
    … …  
    503503}
    504504
    505 #ifdef VBOX_HGCM
     505#ifdef VBOX_WITH_HGCM
    506506
    507507/* HGCM connector interface */
    … …  
    620620        case PDMINTERFACE_VMMDEV_CONNECTOR:
    621621            return &pDrv->Connector;
    622 #ifdef VBOX_HGCM
     622#ifdef VBOX_WITH_HGCM
    623623        case PDMINTERFACE_HGCM_CONNECTOR:
    624624            return &pDrv->HGCMConnector;
    … …  
    639639    PDRVMAINVMMDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
    640640    LogFlow(("VMMDev::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
    641 #ifdef VBOX_HGCM
     641#ifdef VBOX_WITH_HGCM
    642642    /* HGCM is shut down on the VMMDev destructor. */
    643 #endif /* VBOX_HGCM */
     643#endif /* VBOX_WITH_HGCM */
    644644    if (pData->pVMMDev)
    645645    {
    … …  
    657657{
    658658    LogFlow(("VMMDev::drvReset: iInstance=%d\n", pDrvIns->iInstance));
    659 #ifdef VBOX_HGCM
     659#ifdef VBOX_WITH_HGCM
    660660    HGCMHostReset ();
    661 #endif /* VBOX_HGCM */
     661#endif /* VBOX_WITH_HGCM */
    662662}
    663663
    … …  
    710710    pData->Connector.pfnChangeMemoryBalloon           = vmmdevChangeMemoryBalloon;
    711711
    712 #ifdef VBOX_HGCM
     712#ifdef VBOX_WITH_HGCM
    713713    pData->HGCMConnector.pfnConnect                   = iface_hgcmConnect;
    714714    pData->HGCMConnector.pfnDisconnect                = iface_hgcmDisconnect;
    … …  
    726726    }
    727727
    728 #ifdef VBOX_HGCM
     728#ifdef VBOX_WITH_HGCM
    729729    pData->pHGCMPort = (PPDMIHGCMPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_HGCM_PORT);
    730730    if (!pData->pHGCMPort)
    … …  
    749749    pData->pVMMDev->mpDrv = pData;
    750750
    751 #ifdef VBOX_HGCM
     751#ifdef VBOX_WITH_HGCM
    752752    rc = pData->pVMMDev->hgcmLoadService (VBOXSHAREDFOLDERS_DLL,
    753753                                          "VBoxSharedFolders");
    … …  
    803803
    804804    pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, "HGCM", 0, HGCM_SSM_VERSION, 4096/* bad guess */, NULL, iface_hgcmSave, NULL, NULL, iface_hgcmLoad, NULL);
    805 #endif /* VBOX_HGCM */
     805#endif /* VBOX_WITH_HGCM */
    806806
    807807    return VINF_SUCCESS;

  • trunk/src/VBox/Main/include/ConsoleVRDPServer.h

    r8155 r11820  
    3535///////////////////////////////////////////////////////////////////////////////
    3636
    37 #ifdef VBOX_VRDP
     37#ifdef VBOX_WITH_VRDP
    3838typedef struct _VRDPInputSynch
    3939{
    … …  
    4949    bool fClientScrollLock;
    5050} VRDPInputSynch;
    51 #endif /* VBOX_VRDP */       
     51#endif /* VBOX_WITH_VRDP */       
    5252
    5353/* Member of Console. Helper class for VRDP server management. Not a COM class. */
    … …  
    6262    void NotifyAbsoluteMouse (bool fGuestWantsAbsolute)
    6363    {
    64 #ifdef VBOX_VRDP
     64#ifdef VBOX_WITH_VRDP
    6565        m_fGuestWantsAbsolute = fGuestWantsAbsolute;
    6666#else
    6767        NOREF(fGuestWantsAbsolute);
    68 #endif /* VBOX_VRDP */       
     68#endif /* VBOX_WITH_VRDP */       
    6969    }
    7070
    7171    void NotifyKeyboardLedsChange (BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
    7272    {
    73 #ifdef VBOX_VRDP
     73#ifdef VBOX_WITH_VRDP
    7474        bool fGuestNumLock    = (fNumLock != FALSE);
    7575        bool fGuestCapsLock   = (fCapsLock != FALSE);
    … …  
    9494        NOREF(fCapsLock);
    9595        NOREF(fScrollLock);
    96 #endif /* VBOX_VRDP */       
     96#endif /* VBOX_WITH_VRDP */       
    9797    }
    9898
    … …  
    147147    Console *mConsole;
    148148
    149 #ifdef VBOX_VRDP
     149#ifdef VBOX_WITH_VRDP
    150150    HVRDPSERVER mhServer;
    151151
    … …  
    182182
    183183    VRDPInputSynch m_InputSynch;
    184 #endif /* VBOX_VRDP */
     184#endif /* VBOX_WITH_VRDP */
    185185
    186186    RTCRITSECT mCritSect;

  • trunk/src/VBox/Main/include/DisplayImpl.h

    r8155 r11820  
    110110    bool VideoAccelAllowed (void);
    111111
    112 #ifdef VBOX_VRDP
     112#ifdef VBOX_WITH_VRDP
    113113    void VideoAccelVRDP (bool fEnable);
    114 #endif /* VBOX_VRDP */
     114#endif /* VBOX_WITH_VRDP */
    115115
    116116    // IConsoleCallback methods

  • trunk/src/VBox/Main/include/VMMDev.h

    r11409 r11820  
    6868    uint32_t mu32CredentialsFlags;
    6969   
    70 #ifdef VBOX_HGCM
     70#ifdef VBOX_WITH_HGCM
    7171    bool m_fHGCMActive;
    72 #endif /* VBOX_HGCM */
     72#endif /* VBOX_WITH_HGCM */
    7373};
    7474

  • trunk/src/VBox/Main/xpcom/server.cpp

    r10958 r11820  
    152152NS_DECL_CLASSINFO(SharedFolder)
    153153NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SharedFolder, ISharedFolder)
    154 #ifdef VBOX_VRDP
     154#ifdef VBOX_WITH_VRDP
    155155NS_DECL_CLASSINFO(VRDPServer)
    156156NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VRDPServer, IVRDPServer)

  • trunk/src/VBox/VMM/DBGF.cpp

    r11311 r11820  
    241241    RTStrmPrintf(g_pStdErr, "DBGF: No debugger attached, waiting 15 seconds for one to attach (event=%d)\n", enmEvent);
    242242    RTStrmFlush(g_pStdErr);
    243 # ifdef DEBUG_sandervl
     243# if defined (DEBUG_sandervl) || defined (DEBUG_frank)
    244244    int cWait = 10;
    245245# else
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