Changeset 11820 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

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/Additions/common/VBoxGuestLib

Files:

• Init.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (4 diffs)
• VBGLInternal.h (modified) (1 diff)

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

@@ -178 +178 @@
         vbglQueryVMMDevPort ();
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
         rc = vbglHGCMInit ();
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
 
         if (VBOX_FAILURE(rc))
@@ -195 +195 @@
     vbglTerminateCommon ();
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     vbglHGCMTerminate ();
 #endif

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

@@ -53 +53 @@
 #
 VBoxGuestR0Lib_TEMPLATE     = VBOXGUESTR0LIB
-VBoxGuestR0Lib_DEFS         = VBOX_HGCM
+VBoxGuestR0Lib_DEFS         = VBOX_WITH_HGCM
 VBoxGuestR0Lib_INCS         = \
         $(PATH_VBoxGuestR0Lib)
@@ -69 +69 @@
 #
 VBoxGuestR0LibBase_TEMPLATE = VBOXGUESTR0LIB
-VBoxGuestR0LibBase_DEFS     = VBOX_HGCM VBGL_VBOXGUEST
+VBoxGuestR0LibBase_DEFS     = VBOX_WITH_HGCM VBGL_VBOXGUEST
 VBoxGuestR0LibBase_INCS     = $(VBoxGuestR0Lib_INCS)
 VBoxGuestR0LibBase_INCS.win = $(VBoxGuestR0Lib_INCS.win)
@@ -85 +85 @@
 VBoxGuestR3Lib_TEMPLATE    = VBOXGUESTR3LIB
 VBoxGuestR3Lib_DEFS        = \
-        VBOX_HGCM \
+        VBOX_WITH_HGCM \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
 VBoxGuestR3Lib_SOURCES     = \
@@ -123 +123 @@
 VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3LIB
 VBoxGuestR3LibXFree86_DEFS     = \
-        VBOX_HGCM VBOX_VBGLR3_XFREE86 \
+        VBOX_WITH_HGCM VBOX_VBGLR3_XFREE86 \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
 VBoxGuestR3LibXFree86_SOURCES  = \

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

@@ -108 +108 @@
 int VbglEnter (void);
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
 #ifndef VBGL_VBOXGUEST
 /* Initialize HGCM subsystem. */