Changeset 65184 in vbox

Timestamp:

Jan 6, 2017 3:23:19 PM (8 years ago)

Author:

vboxsync

Message:

VideoRec: Makefile update for audio support.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -3703 +3703 @@
 SDK_VBOX_VPX_INCS ?= $(SDK_VBOX_VPX_DEFAULT_INCS)
 SDK_VBOX_VPX_LIBS ?= $(PATH_STAGE_LIB)/VBox-libvpx$(VBOX_SUFF_LIB)
+
+ifdef VBOX_WITH_LIBOPUS
+SDK_VBOX_OPUS       = .
+SDK_VBOX_OPUS_DEFAULT_INCS := $(PATH_ROOT)/src/libs/libopus
+SDK_VBOX_OPUS_INCS ?= $(SDK_VBOX_OPUS_DEFAULT_INCS)
+SDK_VBOX_OPUS_LIBS ?= $(PATH_STAGE_LIB)/VBox-libopus$(VBOX_SUFF_LIB)
+endif
 
 #

trunk/src/VBox/Main/Makefile.kmk

@@ -706 +706 @@
   VBoxC_SDKS += VBOX_VPX
 endif
+ifdef VBOX_WITH_AUDIO_VIDEOREC
+  ifdef VBOX_WITH_LIBOPUS
+   VBoxC_SDKS += VBOX_OPUS
+  else
+   $(error "VBox: No alternative for Opus when using audio support for video capturing yet")
+  endif
+endif
 ifdef VBOX_WITH_OPENSSL_FIPS
   VBoxC_SDKS += VBOX_OPENSSL2

trunk/src/libs/Makefile.kmk

@@ -85 +85 @@
   endif
  endif
+
+ # Opus for audio encoding video capture
+ if defined(VBOX_WITH_LIBOPUS) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) \
+   && ("$(SDK_VBOX_OPUS_INCS)" == "$(SDK_VBOX_OPUS_DEFAULT_INCS)")
+  if1of ($(KBUILD_TARGET), linux)
+   include $(PATH_SUB_CURRENT)/libopus/Makefile.kmk
+  endif
+ endif
 endif