Changeset 11820 in vbox for trunk/src/VBox/Frontends/VBoxBFE

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/Frontends/VBoxBFE

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxBFE.cpp (modified) (6 diffs)
• VMMDevInterface.cpp (modified) (11 diffs)

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

@@ -57 +57 @@
 #endif
 ifdef VBOX_WITH_VRDP
-VBoxBFE_DEFS += VBOX_VRDP
+VBoxBFE_DEFS += VBOX_WITH_VRDP
 endif
 ifneq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COM),win.)
@@ -85 +85 @@
 
 ifdef VBOX_WITH_HGCM
-VBoxBFE_DEFS += VBOX_HGCM
+VBoxBFE_DEFS += VBOX_WITH_HGCM
 VBoxBFE_SOURCES += \
         HGCM.cpp \

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

@@ -46 +46 @@
 # include <VBox/vusb.h>
 #endif
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 # include <VBox/shflsvc.h>
 #endif
@@ -392 +392 @@
              "  -tapfd<1-N> <fd>   Use existing TAP device, don't allocate\n"
 #endif
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
              "  -vrdp [port]       Listen for VRDP connections on port (default if not specified)\n"
 #endif
@@ -418 +418 @@
 {
     bool fFullscreen = false;
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     int32_t portVRDP = -1;
 #endif
@@ -713 +713 @@
         }
 #endif /* RT_OS_LINUX */
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
         else if (strcmp(pszArg, "-vrdp") == 0)
         {
@@ -727 +727 @@
             }
         }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 #ifdef VBOX_SECURELABEL
         else if (strcmp(pszArg, "-securelabel") == 0)
@@ -1185 +1185 @@
     }
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     /*
      * Add shared folders to the VM

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

@@ -42 +42 @@
 #include "DisplayImpl.h"
 #include "ConsoleImpl.h"
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 #include "HGCM.h"
 #endif
@@ -69 +69 @@
     PDMIVMMDEVCONNECTOR         Connector;
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     /** Pointer to the HGCM port interface of the driver/device above us. */
     PPDMIHGCMPORT               pHGCMPort;
@@ -80 +80 @@
 #define PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, Connector)) )
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 /** Converts PDMIHGCMCONNECTOR pointer to a DRVMAINVMMDEV pointer. */
 #define PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface) ( (PDRVMAINVMMDEV) ((uintptr_t)pInterface - RT_OFFSETOF(DRVMAINVMMDEV, HGCMConnector)) )
@@ -87 +87 @@
 VMMDev::VMMDev() : mpDrv(NULL)
 {
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     int rc = VINF_SUCCESS;
     if (fActivateHGCM())
@@ -97 +97 @@
 VMMDev::~VMMDev()
 {
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     if (fActivateHGCM())
         HGCMHostShutdown ();
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
 }
 
@@ -259 +259 @@
 }
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 
 /* HGCM connector interface */
@@ -360 +360 @@
         case PDMINTERFACE_VMMDEV_CONNECTOR:
             return &pDrv->Connector;
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
         case PDMINTERFACE_HGCM_CONNECTOR:
             if (fActivateHGCM())
@@ -430 +430 @@
     pData->Connector.pfnQueryVisibleRegion      = iface_QueryVisibleRegion;
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     if (fActivateHGCM())
     {
@@ -449 +449 @@
     }
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     if (fActivateHGCM())
     {
@@ -475 +475 @@
     pData->pVMMDev->mpDrv = pData;
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     if (fActivateHGCM())
     {
@@ -487 +487 @@
         pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, "HGCM", 0, HGCM_SSM_VERSION, 4096/* bad guess */, NULL, iface_hgcmSave, NULL, NULL, iface_hgcmLoad, NULL);
     }
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
 
     return VINF_SUCCESS;