Changeset 41941 in vbox for trunk

Timestamp:

Jun 28, 2012 1:46:39 AM (13 years ago)

Author:

vboxsync

Message:

libs/libvpx: To make compilation and installation of libvpx integral part of VBox compilation.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -2589 +2589 @@
  SDK_VBOX_FFMPEG_INCS ?= /usr/include/ffmpeg /usr/include/libpng
  SDK_VBOX_FFMPEG_LIBS ?= avutil avcodec avformat
+endif
+
+#VPXLIB
+SDK_VBOX_VPX       = .
+if1of ($(KBUILD_TARGET), darwin linux os2 solaris win)
+ SDK_VBOX_VPX_INCS ?=  \
+     $(PATH_ROOT)/src/libs/libvpx/vpx \
+     $(PATH_ROOT)/src/libs/libvpx/vp8 \
+     $(PATH_ROOT)/src/libs/libvpx/vpx_mem
+SDK_VBOX_VPX_LIBS ?=  $(PATH_STAGE_BIN)/VBox-libvpx.so
 endif
 

trunk/src/libs/Makefile.kmk

@@ -69 +69 @@
  endif
 
- # FFmpeg for test videos.
+ # FFmpeg & VP8 for test videos.
  if defined(VBOX_WITH_FFMPEG) && !defined(VBOX_OSE) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK)
   if1of ($(KBUILD_TARGET), darwin linux solaris)
    include $(PATH_SUB_CURRENT)/ffmpeg-20060710/Makefile.kmk
+  endif
+  if1of ($(KBUILD_TARGET), darwin linux solaris)
+   include $(PATH_SUB_CURRENT)/libvpx/Makefile.kmk
   endif
  endif