Changeset 62577 in vbox for trunk/src

Timestamp:

Jul 27, 2016 9:27:46 AM (8 years ago)

Author:

vboxsync

Message:

Build fix.

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (6 diffs)
• Main/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -538 +538 @@
 
  VBoxDD_SOURCES         += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchAc97.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevSB16.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHdaCodec.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/AudioMixBuffer.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/AudioMixer.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvAudio.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvAudioCommon.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostNullAudio.cpp
+        Audio/DevIchAc97.cpp \
+        Audio/DevSB16.cpp \
+        Audio/DevIchHda.cpp \
+        Audio/DevIchHdaCodec.cpp \
+        Audio/AudioMixBuffer.cpp \
+        Audio/AudioMixer.cpp \
+        Audio/DrvAudio.cpp \
+        Audio/DrvAudioCommon.cpp \
+        Audio/DrvHostNullAudio.cpp
 
  ifeq ($(KBUILD_TARGET),darwin)
   VBoxDD_SOURCES += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostCoreAudio.cpp
+        Audio/DrvHostCoreAudio.cpp
  endif
 
  ifeq ($(KBUILD_TARGET),win)
   VBoxDD_SOURCES += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostDSound.cpp
+        Audio/DrvHostDSound.cpp
  endif
 
@@ -561 +561 @@
   VBoxDD_DEFS    += VBOX_WITH_OSS
   VBoxDD_SOURCES += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostOSSAudio.cpp
+        Audio/DrvHostOSSAudio.cpp
  endif
 
@@ -567 +567 @@
   VBoxDD_DEFS    += VBOX_WITH_ALSA
   VBoxDD_SOURCES += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostALSAAudio.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/alsa_stubs.c
+        Audio/DrvHostALSAAudio.cpp \
+        Audio/alsa_stubs.c
  endif
 
@@ -574 +574 @@
   VBoxDD_DEFS    += VBOX_WITH_PULSE
   VBoxDD_SOURCES += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostPulseAudio.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/pulse_stubs.c
+        Audio/DrvHostPulseAudio.cpp \
+        Audio/pulse_stubs.c
  endif
 
@@ -873 +873 @@
 
   VBoxDDRC_SOURCES      += \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
+        Audio/DevIchHda.cpp
 
   ifdef VBOX_WITH_E1000
@@ -1038 +1038 @@
         Network/DrvIntNet.cpp \
         Network/DrvDedicatedNic.cpp \
-        $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
+        Audio/DevIchHda.cpp
 
  VBoxDDR0_SOURCES.win += Parallel/DrvHostParallel.cpp

trunk/src/VBox/Main/Makefile.kmk

@@ -786 +786 @@
 # Audio bits.
 VBoxC_SOURCES += \
-        ../Devices/$(VBOX_AUDIO_PATH_SOURCES)/AudioMixBuffer.cpp \
-        ../Devices/$(VBOX_AUDIO_PATH_SOURCES)/DrvAudioCommon.cpp \
+        ../Devices/Audio/AudioMixBuffer.cpp \
+        ../Devices/Audio/DrvAudioCommon.cpp \
         $(if $(VBOX_WITH_VRDE_AUDIO),src-client/DrvAudioVRDE$(VBOX_AUDIO_FILE_SUFFIX).cpp,)