Changeset 45748 in vbox

Timestamp:

Apr 25, 2013 8:52:31 PM (12 years ago)

Author:

vboxsync

Message:

purge ffmpeg

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -1039 +1039 @@
  ## @todo remove once the iPXE code is in public tree
  VBOX_WITHOUT_IPXE=1
- VBOX_WITH_FFMPEG=
  VBOX_WITH_VPX=
  # Disable for OSE, requires snv_159+.
@@ -2729 +2728 @@
 SDK_VBOX_LIBCURL_LIBS ?= $(PATH_STAGE_LIB)/VBox-libcurl$(VBOX_SUFF_LIB)
 SDK_VBOX_LIBCURL_DEFS ?= BUILDING_LIBCURL
-endif
-
-SDK_VBOX_FFMPEG       = .
-if1of ($(KBUILD_TARGET), darwin linux os2 solaris win)
- SDK_VBOX_FFMPEG_INCS ?= \
-        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavutil \
-        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavcodec \
-        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavformat
- ifeq ($(KBUILD_TARGET),win)
-  ## @todo Michael! Where is $(PATH_STAGE_LIB)/VBoxFFmpegImp$(VBOX_SUFF_LIB) supposed to come from?
-  #SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_LIB)/VBoxFFmpeg.a
-  SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_LIB)/VBoxFFmpegImp.lib
- else
-  SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_BIN)/VBoxFFmpeg$(SUFF_DLL)
- endif
-else
- SDK_VBOX_FFMPEG_INCS ?= /usr/include/ffmpeg /usr/include/libpng
- SDK_VBOX_FFMPEG_LIBS ?= avutil avcodec avformat
 endif