[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[215] mplayerxp

[<nic...@us...>]

Revision: 215
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=215&view=rev
Author:   nickols_k
Date:     2012-10-26 09:25:53 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
make development easy

Modified Paths:
--------------
    mplayerxp/Makefile
    mplayerxp/configure

Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile	2012-10-26 08:49:43 UTC (rev 214)
+++ mplayerxp/Makefile	2012-10-26 09:25:53 UTC (rev 215)
@@ -28,11 +28,11 @@
 
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
-FF_LIBS = ../ffmpeg/libavcodec/libavcodec.a \
-	  ../ffmpeg/libswscale/libswscale.a \
-	  ../ffmpeg/libpostproc/libpostproc.a \
-	  ../ffmpeg/libavformat/libavformat.a \
-	  ../ffmpeg/libavutil/libavutil.a
+FF_LIBS = ../ffmpeg/libavcodec/libavcodec$(FF_SUFFIX).a \
+	  ../ffmpeg/libswscale/libswscale$(FF_SUFFIX).a \
+	  ../ffmpeg/libpostproc/libpostproc$(FF_SUFFIX).a \
+	  ../ffmpeg/libavformat/libavformat$(FF_SUFFIX).a \
+	  ../ffmpeg/libavutil/libavutil$(FF_SUFFIX).a
 
 MP_LIBS = libmpdemux/libmpdemux.a \
 	  libmpcodecs/libmpcodecs.a \

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2012-10-26 08:49:43 UTC (rev 214)
+++ mplayerxp/configure	2012-10-26 09:25:53 UTC (rev 215)
@@ -325,14 +325,20 @@
 _arch=$host_arch
 x86_32 && _arch="i686"
 x86_64 && _arch="x86_64"
-ffmpeg_args="--arch=$_arch $ffmpeg_args"
+x86_32 && ff_libsuffix="32"
+x86_64 && ff_libsuffix="64"
+ffmpeg_args="--arch=$_arch --build-suffix=$ff_libsuffix $ffmpeg_args"
 fi
 test "$debug" != "0" && ffmpeg_args="$ffmpeg_args --enable-debug=$debug"
 enabled $profile  && ffmpeg_args="$ffmpeg_args --enable-profile"
+if test -f "../ffmpeg/libavcodec/libavcodec$ff_libsuffix.a"; then
+echocheck "ffmpeg was already configured for $ff_libsuffix"
+else
 echocheck "configuring ffmpeg stuff: --cc=\"$cc\" $ffmpeg_args"
 cd ../ffmpeg
 $(LC_ALL=C ./configure --cc="$cc" $ffmpeg_args)
 cd $srcdir
+fi
 echores "done"
 ###################################
 
@@ -748,6 +754,7 @@
 LIBDIR = $libdir
 DESTDIR = $DESTDIR
 PROGNAME = $prog_alias
+FF_SUFFIX=$ff_libsuffix
 AR = ar
 CC = $cc
 LDCONFIG=$ldconfig

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.