[MPlayer-cvslog] r30958 - trunk/configure
diego
subversion at mplayerhq.hu
Thu Mar 25 19:51:58 CET 2010
Author: diego
Date: Thu Mar 25 19:51:57 2010
New Revision: 30958
Log:
Move some FFmpeg-specific entries to the FFmpeg section of config.mak.
Modified:
trunk/configure
Modified: trunk/configure
==============================================================================
--- trunk/configure Thu Mar 25 13:58:41 2010 (r30957)
+++ trunk/configure Thu Mar 25 19:51:57 2010 (r30958)
@@ -8446,10 +8446,8 @@ AS = $_cc
CC = $_cc
CXX = $_cc
HOST_CC = $_host_cc
-YASM = $_yasm
INSTALL = $_install
INSTALLSTRIP = $_install_strip
-RANLIB = $_ranlib
WINDRES = $_windres
CFLAGS = $CFLAGS $extra_cflags
@@ -8465,7 +8463,6 @@ CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cfl
CFLAGS_STACKREALIGN = $cflags_stackrealign
CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
CFLAGS_TREMOR_LOW = $cflags_tremor_low
-YASMFLAGS = $YASMFLAGS
EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs
EXTRALIBS_MPLAYER = $libs_mplayer
@@ -8535,8 +8532,6 @@ FAAC=$_faac
FAAD = $_faad
FAAD_INTERNAL = $_faad_internal
FASTMEMCPY = $_fastmemcpy
-$mak_hardcoded_tables
-$mak_libavcodec_mpegaudio_hp
FBDEV = $_fbdev
FREETYPE = $_freetype
FTP = $_ftp
@@ -8685,6 +8680,10 @@ HOSTCFLAGS=-D_ISOC99_SOURCE -D_POSIX_C_S
HOSTLIBS=-lm
CC_O=-o \$@
LD=gcc
+RANLIB = $_ranlib
+YASM = $_yasm
+YASMFLAGS = $YASMFLAGS
+
CONFIG_STATIC=yes
SRC_PATH=..
BUILD_ROOT=..
@@ -8705,6 +8704,9 @@ CONFIG_LSP=yes
CONFIG_MDCT=yes
CONFIG_RDFT=yes
+$mak_hardcoded_tables
+$mak_libavcodec_mpegaudio_hp
+
CONFIG_BZLIB=$bzlib
CONFIG_ENCODERS=yes
CONFIG_GPL=yes
More information about the MPlayer-cvslog
mailing list