[vlc-devel] commit: Contribs: Fix FFmpeg configure for Win32 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep 22 16:45:15 2009 +0200| [4d795a89fb2f8cd00431e6d8ada345da5d0ecf6a] | committer: Jean-Baptiste Kempf 

Contribs: Fix FFmpeg configure for Win32

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d795a89fb2f8cd00431e6d8ada345da5d0ecf6a
---

 extras/contrib/src/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5995b30..405ed0d 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -115,11 +115,11 @@ endif
 #
 ifdef HAVE_WIN32
 HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
-FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686
+FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack
 ifdef HAVE_WIN64
 FFMPEGCONF+= --cpu=athlon64 --arch=x86_64
 else
-FFMPEGCONF+= --cpu=i686 --arch=x86_32
+FFMPEGCONF+= --cpu=i686
 endif
 endif
 
@@ -1077,7 +1077,7 @@ else
 .ffmpeg: ffmpeg .lame .gsm
 endif
 endif
-	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
+	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@
 
 ifdef SVN