Mercurial > mplayer.hg

changeset 33643:311468e8af65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Compile libav* libraries from the top level of the ffmpeg subdirectory. Compiling from subdirectories is not guaranteed to work correctly.
author diego
date Sun, 26 Jun 2011 14:16:40 +0000
parents 20cf5b01802a
children c15dabfa2380
files Makefile configure
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jun 26 14:16:38 2011 +0000
+++ b/Makefile	Sun Jun 26 14:16:40 2011 +0000
@@ -807,7 +807,7 @@
 	$(WINDRES) -I. $< $@
 
 $(FFMPEGLIBS): $(FFMPEGFILES) config.h
-	$(MAKE) -C $(@D)
+	$(MAKE) -C ffmpeg $(@:ffmpeg/%=%)
 	touch $@
 
 mencoder$(EXESUF): $(MENCODER_DEPS)
--- a/configure	Sun Jun 26 14:16:38 2011 +0000
+++ b/configure	Sun Jun 26 14:16:40 2011 +0000
@@ -8772,7 +8772,10 @@
 
 # Create a config.mak for FFmpeg that includes MPlayer's config.mak.
 cat > ffmpeg/config.mak << EOF
-include ../../config.mak
+ifndef FFMPEG_CONFIG_MAK
+FFMPEG_CONFIG_MAK = 1
+include ../config.mak
+endif # MPLAYER_CONFIG_MAK
 EOF
 
 cat > ffmpeg/config.h << EOF