Browse Source

contribs: fix FFmpeg target when building ARM

Specify --target-os=linux when HAVE_LINUX is 1
Don't depend on libvpx on armel
pull/2/head
Rafaël Carré 16 years ago
parent
commit
85fadc92b7
  1. 5
      extras/contrib/src/Makefile

5
extras/contrib/src/Makefile

@ -169,6 +169,7 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
endif
ifdef HAVE_LINUX
FFMPEGCONF+= --target-os=linux
ifdef HAVE_MAEMO
ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
@ -1112,8 +1113,12 @@ else
ifdef HAVE_UCLIBC
.ffmpeg: ffmpeg
else
ifeq ($(ARCH),armel)
.ffmpeg: ffmpeg .lame .gsm .zlib
else
.ffmpeg: ffmpeg .lame .gsm .libvpx .zlib
endif
endif
endif
(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
touch $@

Loading…
Cancel
Save