Changeset 18788 in vbox for trunk/src/VBox

Timestamp:

Apr 6, 2009 4:34:16 PM (16 years ago)

Author:

vboxsync

Message:

VBoxSDL: cleanup to get X11 dependencies right

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (5 diffs)

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

@@ -208 +208 @@
 #ifdef VBOXSDL_WITH_X11
 static Cursor      gpDefaultOrigX11Cursor;
+#ifdef RT_OS_LINUX
 static BOOL        guseEvdevKeymap = FALSE;
+#endif
 #endif
 static SDL_Cursor *gpCustomCursor = NULL;
@@ -677 +679 @@
              "  --hostkey <key> {<key2>} <mod> Set the host key to the values obtained using --detecthostkey\n"
              "  --termacpi               Send an ACPI power button event when closing the window\n"
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) /** @todo UNIXISH_TAP stuff out of main and up to Config.kmk! */
+#if defined(RT_OS_LINUX)
              "  --evdevkeymap            Use evdev keycode map\n"
 #endif
@@ -1450 +1452 @@
             }
         }
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_LINUX) && defined(VBOXSDL_WITH_X11)
         else if (   !strcmp(argv[curArg], "--evdevkeymap")
                  || !strcmp(argv[curArg], "-evdevkeymap"))
@@ -3271 +3273 @@
         keycode -= 8;
     }
+#ifdef RT_OS_LINUX
     else if (keycode < 158 && guseEvdevKeymap)
     {
@@ -3276 +3279 @@
         keycode = evdev_keycode_to_pc_keycode[keycode - 97];
     }
+#endif
     else if (keycode < 158)
     {