Changeset 38913 in vbox

Timestamp:

Sep 30, 2011 9:53:47 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74250

Message:

compile fixes for VBOX_WITH_EXTPACK disabled

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (2 diffs)
• Devices/build/VBoxDD.cpp (modified) (1 diff)
• Devices/build/VBoxDD.h (modified) (1 diff)
• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (modified) (2 diffs)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -722 +722 @@
 
  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-  VBoxDDR0_SOURCES      +=
+  VBoxDDR0_SOURCES      += \
         Bus/DevPciRaw.cpp
  endif
@@ -938 +938 @@
 
  ifdef VBOX_WITH_UDPTUNNEL
- Drivers_SOURCES += \
+  Drivers_SOURCES += \
         Network/DrvUDPTunnel.cpp
- Drivers_DEFS += VBOX_WITH_UDPTUNNEL
+  Drivers_DEFS += VBOX_WITH_UDPTUNNEL
  endif
  ifdef VBOX_WITH_VDE
- Drivers_SOURCES += \
+  Drivers_SOURCES += \
         Network/DrvVDE.cpp \
         Network/VDEPlug.cpp
- Drivers_DEFS += VBOX_WITH_VDE
+  Drivers_DEFS += VBOX_WITH_VDE
+ endif
+ if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+  Drivers_SOURCES += \
+        Bus/DrvPciRaw.cpp
+  Drivers_DEFS += VBOX_WITH_PCI_PASSTHROUGH_IMPL
  endif
 

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -316 +316 @@
 #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvPciRaw);
-    if (RT_FAILURED(rc))
+    if (RT_FAILURE(rc))
         return rc;
 #endif

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -124 +124 @@
 extern const PDMDRVREG g_DrvDiskIntegrity;
 #endif
+#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
+extern const PDMDRVREG g_DrvPciRaw;
+#endif
 
 #ifdef VBOX_WITH_USB

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

@@ -109 +109 @@
         $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
         $(if $(VBOX_WITH_UDPTUNNEL),VBOX_WITH_UDPTUNNEL) \
+        $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK) \
         $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) \
         $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI) \

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -470 +470 @@
 {
     /* USB 2.0 Extension Pack presence test: */
+    NOREF(strWarningText);
+#ifdef VBOX_WITH_EXTPACK
     CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName);
     if (mGbUSB->isChecked() && mCbUSB2->isChecked() && (extPack.isNull() || !extPack.GetUsable()))
@@ -482 +484 @@
         return true;
     }
+#endif
     return true;
 }

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -6428 +6428 @@
         if (FAILED(rc))
             throw rc;
+#ifdef VBOX_WITH_EXTPACK
         mptrExtPackManager->dumpAllToReleaseLog();
+#endif
 
 #ifdef RT_OS_SOLARIS