Changeset 4861 in vbox

Timestamp:

Sep 17, 2007 3:48:39 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24580

Message:

Solaris is using X11. But it's currently missing Xcursor, so disable that until we've time to build it ourselves.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• Makefile.kmk (modified) (2 diffs)
• SDLConsole.cpp (modified) (2 diffs)

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

@@ -40 +40 @@
 VBoxBFE_DEFS += VBOX_WITHOUT_LINUX_COMPILER_H
 endif
+VBoxBFE_DEFS.freebsd = VBOXBFE_WITH_X11
 VBoxBFE_DEFS.l4 = _GNU_SOURCE
 VBoxBFE_DEFS.linux = _GNU_SOURCE VBOXBFE_WITH_X11
+VBoxBFE_DEFS.solaris = VBOXBFE_WITH_X11 VBOXBFE_WITHOUT_XCURSOR
 VBoxBFE_DEFS.win.x86 = _WIN32_WINNT=0x0500
 
@@ -81 +83 @@
         SDLFramebuffer.cpp
 VBoxBFE_SOURCES.solaris = \
-    SDLConsole.cpp \
-    SDLFramebuffer.cpp
+        SDLConsole.cpp \
+        SDLFramebuffer.cpp
 
 VBoxBFE_INCS = \

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

@@ -49 +49 @@
 #ifdef VBOXBFE_WITH_X11
 # include <X11/Xlib.h>
-# include <X11/Xcursor/Xcursor.h>
+# ifndef VBOXBFE_WITHOUT_XCURSOR
+#  include <X11/Xcursor/Xcursor.h>
+# endif
 #endif
 
@@ -1394 +1396 @@
             ::DeleteObject (hBitmap);
 
-#elif defined(VBOXBFE_WITH_X11)
+#elif defined(VBOXBFE_WITH_X11) && !defined(VBOXBFE_WITHOUT_XCURSOR)
 
         XcursorImage *img = XcursorImageCreate (data->width, data->height);