Changeset 16696 in vbox for trunk

Timestamp:

Feb 11, 2009 8:37:42 PM (16 years ago)

Author:

vboxsync

Message:

qt/darwin: another build fix.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/darwin/DarwinKeyboard.cpp (modified) (4 diffs)

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

@@ -152 +152 @@
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
 VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
-VirtualBox_DEFS.darwin.x86= VBOX_GUI_USE_QUARTZ2D
+VirtualBox_DEFS.darwin.x86= VBOX_GUI_USE_QUARTZ2D USE_HID_FOR_MODIFIERS
 VirtualBox_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
 VirtualBox_DEFS.linux     = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
@@ -550 +550 @@
 #
 ifdef VBOX_WITH_TESTCASES
-PROGRAMS.darwin += tstDarwinKeyboard4
-tstDarwinKeyboard4_NAME = tstDarwinKeyboard
-tstDarwinKeyboard4_TEMPLATE = VBOXR3TSTEXE
-tstDarwinKeyboard4_INCS = include
-tstDarwinKeyboard4_SOURCES = \
+PROGRAMS.darwin += tstDarwinKeyboard
+tstDarwinKeyboard_NAME = tstDarwinKeyboard
+tstDarwinKeyboard_TEMPLATE = VBOXR3TSTEXE
+tstDarwinKeyboard_DEFS.x86 = USE_HID_FOR_MODIFIERS
+tstDarwinKeyboard_INCS = include
+tstDarwinKeyboard_SOURCES = \
         src/darwin/tstDarwinKeyboard.cpp \
-        src/darwin/DarwinKeyboard.cpp \
+        src/darwin/DarwinKeyboard.cpp
+tstDarwinKeyboard_SOURCES.amd64 = \
         src/darwin/VBoxCocoaApplication.m
-tstDarwinKeyboard4_LDFLAGS = -framework IOKit -framework Carbon -framework AppKit
-tstDarwinKeyboard4_LIBS = \
+tstDarwinKeyboard_LDFLAGS = -framework IOKit -framework Carbon -framework AppKit
+tstDarwinKeyboard_LIBS = \
         $(LIB_RUNTIME)
 endif

trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinKeyboard.cpp

@@ -34 +34 @@
 #endif
 
-#ifdef RT_ARCH_X86
-# define USE_HID_FOR_MODIFIERS
+#ifdef USE_HID_FOR_MODIFIERS
 # include <mach/mach.h>
 # include <mach/mach_error.h>
@@ -478 +477 @@
 }
 
-
-
 #ifdef USE_HID_FOR_MODIFIERS
-
 
 /**
@@ -965 +961 @@
 #endif /* USE_HID_FOR_MODIFIERS */
 
-
-
 /**
  * Left / rigth adjust the modifier mask using the current
@@ -986 +980 @@
 #ifndef USE_HID_FOR_MODIFIERS
         /*
-         * Convert the Cocoa modifiers to Carbon ones.
+         * Convert the Cocoa modifiers to Carbon ones (the Cocoa modifier
+         * definitions are tucked away in Objective-C headers, unfortunately).
          */
         AssertPtr(pvCocoaEvent);
-        VBoxCocoaApplication_printEvent("dbg-adjMods: ", pvCocoaEvent);
+        //VBoxCocoaApplication_printEvent("dbg-adjMods: ", pvCocoaEvent);
         uint32_t fAltModifiers = VBoxCocoaApplication_getEventModifierFlagsXlated(pvCocoaEvent);