Changeset 1565 in vbox for trunk/src/VBox/Devices/Makefile

Timestamp:

Mar 20, 2007 3:06:26 AM (18 years ago)

Author:

vboxsync

Message:

Split out the bulk of the VDI code from VBoxDD and put it in VBoxDDU (devices and drivers utilities).

File:

• trunk/src/VBox/Devices/Makefile (modified) (9 diffs)

trunk/src/VBox/Devices/Makefile

@@ -26 +26 @@
 endif
 LIBRARIES = DevicesR3 Drivers ServicesR0
-DLLS      = VBoxDD VBoxDD2
+DLLS      = VBoxDDU VBoxDD VBoxDD2
 SYSMODS   = VBoxDDGC VBoxDD2GC VBoxDDR0 VBoxDD2R0
 
@@ -46 +46 @@
 #
 ifdef VBOX_USE_IOAPIC
-DEFS += USE_IOAPIC
+ DEFS += USE_IOAPIC
 endif
 ifdef VBOX_WITH_VRDP
-DEFS += VBOX_VRDP
+ DEFS += VBOX_VRDP
 endif
 ifdef VBOX_WITH_INTERNAL_NETWORKING
-DEFS += VBOX_WITH_INTERNAL_NETWORKING
+ DEFS += VBOX_WITH_INTERNAL_NETWORKING
 endif
 
 # enable the pdm lock.
 #DEFS += VBOX_WITH_PDM_LOCK
+
+
+#
+# VBoxDDU (shared object)
+#
+VBoxDDU_TEMPLATE         = VBOXR3
+VBoxDDU_SDKS.win         = WINPSDK DXSDK W2K3DDK VBOX_NTDLL
+VBoxDDU_SOURCES          = \
+        Storage/VDICore.cpp
+#       Storage/VmdkHDDCore.cpp
+VBoxDDU_LIBS             = \
+        $(PATH_LIB)/DevicesR3$(VBOX_SUFF_LIB) \
+        $(PATH_LIB)/Drivers$(VBOX_SUFF_LIB) \
+        $(PATH_LIB)/PcDefBiosLogo$(VBOX_SUFF_LIB) \
+        $(LIB_RUNTIME)
+ifeq ($(BUILD_TARGET),l4)
+ VBoxDDU_LIBS           += \
+        $(L4_LIBDIR)/libl4sys.p.a
+endif
+VBoxDDU_LDFLAGS.darwin   = -install_name @executable_path/VBoxDDU.dylib
+VBoxDDU_LDFLAGS.linux    = -Wl,--no-undefined
+VBoxDDU_LDFLAGS.l4       = -Wl,--no-undefined
 
 
@@ -69 +91 @@
 VBoxDD_DEFS             = VBOX_ACPI
 ifdef VBOX_WITH_USB
-VBoxDD_DEFS            += VBOX_WITH_USB IN_USB_R3
+ VBoxDD_DEFS           += VBOX_WITH_USB IN_USB_R3
 endif
 ifdef VBOX_WITH_ISCSI
-VBoxDD_DEFS            += VBOX_WITH_ISCSI
+ VBoxDD_DEFS           += VBOX_WITH_ISCSI
 endif
 VBoxDD_LIBS             = \
@@ -80 +102 @@
         $(LIB_VMM) \
         $(LIB_RUNTIME)
-VBoxDD_LIBS.win         = \
+ifeq ($(BUILD_TARGET),win)
+ VBoxDD_LIBS           += \
+        $(PATH_LIB)/VBoxDDU.lib \
         $(PATH_LIB)/VBoxDD2.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
-VBoxDD_LIBS.linux       = \
-        $(PATH_BIN)/VBoxDD2.so
-
-#
+else
+ VBoxDD_LIBS           += \
+        $(INSTARGET_VBoxDDU) \
+        $(INSTARGET_VBoxDD2)
+endif
 ifeq ($(BUILD_TARGET),l4)
-VBoxDD_LIBS            += \
+ VBoxDD_LIBS           += \
         $(L4_LIBDIR)/libl4sys.p.a
 endif
-VBoxDD_LIBS.l4          = \
-        $(PATH_BIN)/VBoxDD2.s.so
 VBoxDD_LIBS.darwin      = \
-        $(PATH_BIN)/VBoxDD2.dylib \
         $(LIB_REM)
-VBoxDD_LIBS.os2         = \
-        $(PATH_BIN)/VBoxDD2.dll
 VBoxDD_LDFLAGS.darwin   = -install_name @executable_path/VBoxDD.dylib -framework CoreAudio
 VBoxDD_LDFLAGS.linux    = -Wl,--no-undefined
@@ -104 +124 @@
 
 # damn, fix this.
+ifeq ($(BUILD_TARGET),win) 
 $(PATH_LIB)/VBoxDD2.lib: $(PATH_BIN)/VBoxDD2.dll
+$(PATH_LIB)/VBoxDDU.lib: $(PATH_BIN)/VBoxDDU.dll
+endif
 
 
@@ -180 +203 @@
 
 #
-# VBoxDDGC
+# VBoxDDGC (sysmod)
 #
 VBoxDDGC_TEMPLATE       = VBOXGC
@@ -216 +239 @@
 
 #
-# VBoxDDR0
+# VBoxDDR0 (sysmod)
 #
 VBoxDDR0_TEMPLATE       = VBOXR0
@@ -254 +277 @@
 
 #
-# VBoxDD2GC (LGPL code)
+# VBoxDD2GC (LGPL sysmod)
 #
 VBoxDD2GC_TEMPLATE       = VBOXGC
@@ -274 +297 @@
 
 #
-# VBoxDD2R0 (LGPL code)
+# VBoxDD2R0 (LGPL sysmod)
 #
 VBoxDD2R0_TEMPLATE       = VBOXR0