summaryrefslogtreecommitdiffstats
path: root/contrib/Jamfile
diff options
context:
space:
mode:
authortiter <[email protected]>2006-01-14 19:42:37 +0000
committertiter <[email protected]>2006-01-14 19:42:37 +0000
commitf0746b160593e1237101cbef5e959d0dc04aaf70 (patch)
tree0b27d5eceea7ae712422b5354a2e80ac77de0275 /contrib/Jamfile
parenta88a17da7fe5de934ade9138909bc17d9a1e4250 (diff)
Fixed ffmpeg build on MacIntel
Bumped version to 0.7.1-cvs git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@19 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/Jamfile')
-rw-r--r--contrib/Jamfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile
index 46e14c2c8..2ba2aa492 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -42,6 +42,10 @@ LibA52 $(SUBDIR)/lib/liba52.a : $(SUBDIR)/a52dec.tar.gz ;
# libavcodec
rule LibAvCodec
{
+ if $(OS) = MACOSX && $(OSPLAT) = X86
+ {
+ FFMPEG_OPTIONS = --disable-mmx ;
+ }
Depends $(<) : $(>) ;
Depends lib : $(<) ;
}
@@ -49,7 +53,7 @@ actions LibAvCodec
{
cd `dirname $(>)` && CONTRIB=`pwd` &&
rm -rf ffmpeg && tar xzf ffmpeg.tar.gz && cd ffmpeg &&
- ./configure --prefix=$CONTRIB --enable-gpl &&
+ ./configure --prefix=$CONTRIB $(FFMPEG_OPTIONS) --enable-gpl &&
make -C libavcodec && make -C libavutil &&
make -C libavcodec installlib && make -C libavutil installlib &&
strip -S $CONTRIB/lib/libavcodec.a