Mercurial > mplayer.hg

diff configure @ 33439:8610374fd76c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation with latest FFmpeg.
author reimar
date Mon, 30 May 2011 20:23:45 +0000
parents 08da81bcc970
children fac64fecdb03
line wrap: on
line diff
--- a/configure	Mon May 30 15:11:30 2011 +0000
+++ b/configure	Mon May 30 20:23:45 2011 +0000
@@ -8138,8 +8138,7 @@
 YASMFLAGS  = $YASMFLAGS
 
 CONFIG_STATIC = yes
-SRC_PATH      = ../../
-BUILD_ROOT    = ..
+SRC_PATH      = ../
 LIBPREF       = lib
 LIBSUF        = .a
 LIBNAME       = \$(LIBPREF)\$(NAME)\$(LIBSUF)
@@ -8739,7 +8738,7 @@
 done
 echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS"
 
-cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm
+cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm
 fi
 
 
@@ -8748,6 +8747,10 @@
 include ../../config.mak
 EOF
 
+cat > ffmpeg/config.h << EOF
+#include "../config.h"
+EOF
+
 #############################################################################
 
 cat << EOF