Changeset 5564 in vbox

Timestamp:

Oct 30, 2007 6:17:48 PM (17 years ago)

Author:

vboxsync

Message:

Link USBLib into VBoxDDU.

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (3 diffs)
• Devices/VBoxDDUDeps.cpp (added)
• HostDrivers/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -58 +58 @@
 VBoxDDU_DEFS             = IN_VBOXDDU
 ifdef VBOX_WITH_USB
- VBoxDDU_DEFS.win        = VBOX_WITH_USB
+ VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
  VBoxDDU_SDKS.win        = WINPSDK W2K3DDK
- VBoxDDU_SOURCES.win     = \
-        USB/win32/USBLib-win32.cpp
 else
  VBoxDDU_SDKS.win         = WINPSDK
@@ -68 +66 @@
         Storage/VBoxHDD-new.cpp \
         Storage/VDICore.cpp \
-        Storage/VmdkHDDCore.cpp
+        Storage/VmdkHDDCore.cpp \
+        VBoxDDUDeps.cpp
+ifdef VBOX_WITH_USB
+ VBoxDDU_SOURCES.win     = \
+        USB/win32/USBLib-win32.cpp
+endif
 VBoxDDU_LIBS             = \
         $(LIB_RUNTIME)
+ifdef VBOX_WITH_USB
+ VBoxDDU_LIBS           += \
+        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
+endif
 ifeq ($(BUILD_TARGET),l4)
  VBoxDDU_LIBS           += \
@@ -122 +129 @@
 ifeq ($(BUILD_TARGET),solaris)
  VBoxDD_LIBS           += adm
-endif
-ifdef VBOX_WTIH_USB
-VBoxDD_LIBS.darwin     += \
-        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
 endif
 VBoxDD_LIBS.darwin     += \

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -6 +6 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -22 +22 @@
 ifeq ($(BUILD_TARGET),win)
  include $(PATH_SUB_CURRENT)/VBoxTAP/Makefile.kmk
- ifdef VBOX_WITH_USB
-  include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk
- endif
 endif
-ifeq ($(BUILD_TARGET),darwin)
- ifdef VBOX_WITH_USB
-  include $(PATH_SUB_CURRENT)/VBoxUSB/darwin/Makefile.kmk
- endif
+ifdef VBOX_WITH_USB
+ include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk
 endif