Commit 37dfc772 authored by Christophe Massiot's avatar Christophe Massiot

* extras/contrib/src/Makefile: Fixed installation of ffmpeg. Added libtiff

   in libSDL_image.
parent 4465634c
......@@ -709,7 +709,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
# patch -p 0 < Patches/ffmpeg.patch
.ffmpeg: ffmpeg
(cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --enable-mp3lame --enable-zlib --enable-a52 --disable-ffplay && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
(cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --enable-mp3lame --enable-zlib --enable-a52 --disable-ffplay && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib && make -C libavutil installlib)
touch $@
CLEAN_FILE += .ffmpeg
......@@ -1293,7 +1293,7 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
patch -p 0 < Patches/SDL_image.patch
.SDL_image: SDL_image .SDL .png .jpeg .tiff
(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
(cd $<; ./configure --prefix=$(PREFIX) --enable-tif CFLAGS="$(CFLAGS)" && make && make install)
$(INSTALL_NAME)
touch $@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment