Changeset 61565 in vbox for trunk

Timestamp:

Jun 8, 2016 9:39:01 AM (9 years ago)

Author:

vboxsync

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

107904

Message:

Audio: Fixes for VBOX_WITH_AUDIO_STABLE.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -434 +434 @@
 # Enable new PS/2 mouse emulation.
 VBOX_WITH_NEW_PS2M = 1
-ifdef VBOX_WITH_AUDIO_STABLE
- VBOX_AUDIO_PATH_SOURCES=Audio_old
- VBOX_AUDIO_FILE_SUFFIX=_old
-else
- VBOX_AUDIO_PATH_SOURCES=Audio
- VBOX_AUDIO_FILE_SUFFIX=
-endif
 # Enable OSS audio support.
 VBOX_WITH_OSS = 1
@@ -1167 +1160 @@
  VBOX_BRAND_GUI_CUBE_42PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_cube_42px.png
  VBOX_BRAND_GUI_VBOX_SVG             := $(PATH_ROOT)/src/VBox/Artwork/OSE/virtualbox.svg
+endif
+
+#
+# Audio: Which code base to use.
+# This can be overriden in LocalConfig.kmk.
+#
+ifdef VBOX_WITH_AUDIO_STABLE
+ VBOX_AUDIO_PATH_SOURCES=Audio_old
+ VBOX_AUDIO_FILE_SUFFIX=_old
+else
+ VBOX_AUDIO_PATH_SOURCES=Audio
+ VBOX_AUDIO_FILE_SUFFIX=
 endif
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -884 +884 @@
   VBoxDDRC_INCS           = build
   VBoxDDRC_SOURCES        = \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp \
         Bus/DevPCI.cpp \
         Bus/DevPciIch9.cpp \
@@ -906 +905 @@
         VMMDev/VMMDevTesting.cpp
 
+  VBoxDDRC_DEFS         += $(if $(VBOX_WITH_AUDIO_STABLE),VBOX_WITH_AUDIO_STABLE,)
+  VBoxDDRC_SOURCES      += \
+        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
+
   ifdef VBOX_WITH_E1000
    VBoxDDRC_DEFS        += VBOX_WITH_E1000
@@ -1061 +1064 @@
  VBoxDDR0_SOURCES        = \
         build/VBoxDDR0.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp \
         Bus/DevPCI.cpp \
         Bus/DevPciIch9.cpp \
@@ -1082 +1084 @@
         Parallel/DevParallel.cpp \
         VMMDev/VMMDevTesting.cpp \
-        \
         Network/DrvIntNet.cpp \
         Network/DrvDedicatedNic.cpp
 
  VBoxDDR0_SOURCES.win += Parallel/DrvHostParallel.cpp
+
+ VBoxDDR0_DEFS          += $(if $(VBOX_WITH_AUDIO_STABLE),VBOX_WITH_AUDIO_STABLE,)
+ VBoxDDR0_SOURCES       += \
+        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
 
  ifdef VBOX_WITH_E1000