diff options
| author | titer <[email protected]> | 2006-01-14 18:36:57 +0000 |
|---|---|---|
| committer | titer <[email protected]> | 2006-01-14 18:36:57 +0000 |
| commit | a88a17da7fe5de934ade9138909bc17d9a1e4250 (patch) | |
| tree | 32e457e0925d812c0766fa111afbf4d1bb782b2c /contrib | |
| parent | 9b1acf8cda6d2c5c53000595a6192237e0ed339f (diff) | |
Updated x264 so it builds on MacIntel
Fixed build of XviD on MacIntel
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@18 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Jamfile | 7 | ||||
| -rw-r--r-- | contrib/version_x264.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index 5bdf71bfa..46e14c2c8 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -254,6 +254,10 @@ LibX264 $(SUBDIR)/lib/libx264.a : $(SUBDIR)/x264.tar.gz ; # libxvidcore rule LibXvidCore { + if $(OS) = MACOSX && $(OSPLAT) = X86 + { + XVID_OPTIONS = --disable-assembly ; + } Depends $(<) : $(>) ; Depends lib : $(<) ; } @@ -261,7 +265,8 @@ actions LibXvidCore { cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf xvidcore && tar xzf xvidcore.tar.gz && - cd xvidcore/build/generic/ && ./configure && make libxvidcore.a && + cd xvidcore/build/generic/ && ./configure $(XVID_OPTIONS) && + make libxvidcore.a && cp ./=build/libxvidcore.a $CONTRIB/lib/ && cp ../../src/xvid.h $CONTRIB/include/ && strip -S $CONTRIB/lib/libxvidcore.a diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt index 560f081ab..0ff3c2e51 100644 --- a/contrib/version_x264.txt +++ b/contrib/version_x264.txt @@ -1 +1 @@ -http://download.m0k.org/handbrake/contrib/x264-r305.tar.gz +http://download.m0k.org/handbrake/contrib/x264-r400.tar.gz |