Changeset 27962 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Apr 2, 2010 4:43:02 PM (15 years ago)

Author:

vboxsync

Message:

Config.kmk,VBoxHeadless: VNC build fixes + docs.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxHeadless.cpp (modified) (3 diffs)

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

@@ -66 +66 @@
  VBoxHeadless_DEFS     += VBOX_WITH_VNC
  VBoxHeadless_SOURCES  += FramebufferVNC.cpp
+ VBoxHeadless_LIBS     += vncserver
 endif
 

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VBox frontends: VBoxHeadless (headless frontend):
- * Headless server executable
+ * VBoxHeadless - The VirtualBox Headless frontend for running VMs on servers.
  */
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -67 +66 @@
 # include "Framebuffer.h"
 #endif
+#ifdef VBOX_WITH_VNC
+# include "FramebufferVNC.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -962 +965 @@
         if (fVNCEnable)
         {
-            VNCFB           *pFramebuffer;
-            PFNREGISTERVNCFB pfnRegisterVNCFB;
-
-            pFramebuffer = new VNCFB(console, uVNCPort, pszVNCPassword);
-            rc = pFramebuffer->init();
+            VNCFB           *pFramebufferVNC;
+
+            pFramebufferVNC = new VNCFB(console, uVNCPort, pszVNCPassword);
+            rc = pFramebufferVNC->init();
             if (rc != S_OK)
             {
                 LogError("Failed to load the vnc server extension, possibly due to a damaged file\n", rc);
-                delete pFramebuffer;
+                delete pFramebufferVNC;
                 break;
             }
 
             Log2(("VBoxHeadless: Registering VNC framebuffer\n"));
-            pFramebuffer->AddRef();
-            display->SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, pFramebuffer);
+            pFramebufferVNC->AddRef();
+            display->SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, pFramebufferVNC);
         }
         if (rc != S_OK)