Changeset 8251 in vbox for trunk/src/VBox

Timestamp:

Apr 21, 2008 7:05:24 PM (17 years ago)

Author:

vboxsync

Message:

USBLib goes into VBoxDDU.

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (2 diffs)
• Devices/VBoxDDUDeps.cpp (modified) (2 diffs)
• Main/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -70 +70 @@
  ifdef VBOX_WITH_EHCI
   VBoxDDU_DEFS          += VBOX_WITH_EHCI
+ endif
+ ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+  VBoxDDU_DEFS.darwin   += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
  endif
 else
@@ -102 +105 @@
 endif
 VBoxDDU_LDFLAGS.darwin   = -install_name @executable_path/VBoxDDU.dylib
+ifdef VBOX_WITH_USB
+ ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+ VBoxDDU_LDFLAGS.darwin += -framework IOKit
+ endif
+endif
+
 VBoxDDU_LDFLAGS.linux    = -Wl,--no-undefined
 VBoxDDU_LDFLAGS.l4       = -Wl,--no-undefined

trunk/src/VBox/Devices/VBoxDDUDeps.cpp

@@ -25 +25 @@
 #include <VBox/types.h>
 #ifdef VBOX_WITH_USB
+# include <VBox/usblib.h>
 # include <VBox/usbfilter.h>
 # ifdef RT_OS_OS2
@@ -41 +42 @@
 # ifdef RT_OS_OS2
     (PFNRT)UsbOpen,
-# endif 
-#endif
+# endif
+# if (defined(RT_OS_DARWIN) && defined(VBOX_WITH_NEW_USB_CODE_ON_DARWIN))
+  /** @todo || defined(RT_OS_SOLARIS) */
+    (PFNRT)USBLibInit,
+# endif
+#endif /* VBOX_WITH_USB */
     NULL
 };

trunk/src/VBox/Main/Makefile.kmk

@@ -176 +176 @@
         $(LIB_DDU) \
         $(LIB_SETTINGS)
-ifdef VBOX_WITH_USB
- VBoxSVC_LIBS += \
-        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
-endif
 VBoxSVC_LIBS.darwin = \
         $(LIB_VMM) \