Adding NASM to the mac build.

diff --git a/.travis.yml b/.travis.yml
index 881ef7c11dbe0b546eb4a23c309fb2b58ba83960..22c536a66ae997cc5d5606be3cdf987223bf276c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,10 @@ script:
 
 # Macos Build Support
 - if [[ "$TRAVIS_OS_NAME" == "osx" && -d "$HOME/toolchains/mac" ]]; then sudo ./scripts/mac-toolchain-build ~/toolchains/mac  ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$HOME/toolchains/mac/bin:$PATH ; fi
+- if [[ "$BUILD_MINGW" == true ]]; then wget https://www.nasm.us/pub/nasm/releasebuilds/2.14/nasm-2.14.tar.gz ; fi
+- if [[ "$BUILD_MINGW" == true ]]; then tar xvf nasm-2.14.tar.gz && cd nasm-2.14/ && ./configure && make && cd ..  ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=/home/travis/build/HandBrake/HandBrake/nasm-2.14/:$HOME/toolchains/mac/bin:$PATH ; fi
+- echo $PATH
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./configure --launch --launch-jobs=0 ; fi