1
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00

Contribs: Fix FFmpeg configure for Win32

This commit is contained in:
Jean-Baptiste Kempf 2009-09-22 16:45:15 +02:00
parent eff1a4cec2
commit 4d795a89fb

View File

@ -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