Changeset 33586 in vbox for trunk/src/VBox/Storage/testcase

Timestamp:

Oct 28, 2010 10:00:52 PM (14 years ago)

Author:

vboxsync

Message:

Storage: Build vbox-img like before because it doesn't want to link against the static storage library on Windows for some reason. Disable LibStorageNoDB for now.

File:

• trunk/src/VBox/Storage/testcase/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Storage/testcase/Makefile.kmk

@@ -49 +49 @@
 #
 ifdef VBOX_WITH_TESTCASES
- PROGRAMS += tstVD tstVD-2 tstVDCopy tstVDSnap tstVDShareable #vbox-img
+ PROGRAMS += tstVD tstVD-2 tstVDCopy tstVDSnap tstVDShareable vbox-img
  tstVD_TEMPLATE = VBOXR3TSTEXE
  tstVD-2_TEMPLATE = VBOXR3TSTEXE
@@ -63 +63 @@
  tstVDSetUuid_LIBS   = $(LIB_DDU) $(LIB_RUNTIME)
  vbox-img_LIBS = \
-        $(PATH_LIB)/StorageLibNoDB$(VBOX_SUFF_LIB) \
         $(VBOX_LIB_RUNTIME_STATIC)
  if1of ($(KBUILD_TARGET),os2 win)
@@ -88 +87 @@
 
  vbox-img_SOURCES = \
-        vbox-img.cpp
- vbox-img_DEFS = IN_VBOXDDU IN_VBOXDDU_STATIC IN_RT_R3
+        vbox-img.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/VD.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/VDI.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/VMDK.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/VHD.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/DMG.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/Parallels.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/ISCSI.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/RAW.cpp \
+        $(VBOX_PATH_STORAGE_SRC)/VCICache.cpp
+ vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
 endif