Adding NASM to the path

diff --git a/.travis.yml b/.travis.yml
index adb892949663d8112de0875594e1d48d24712bf5..5230419a118ec7252e7b3e9ba54c94930eeb3ce8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,11 +28,14 @@ script:
 
 # MinGW Build Support
 - if [[ "$BUILD_MINGW" == true && ! -d "$HOME/toolchains/mingw-w64-5.0.2-gcc-7.1.0" ]]; then ./scripts/mingw-w64-build x86_64 && ./scripts/mingw-w64-build x86_64.clean ; fi
-- if [[ "$BUILD_MINGW" == true ]]; then export PATH=$HOME/toolchains/mingw-w64-5.0.2-gcc-7.1.0/mingw-w64-x86_64/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 ; fi
-- if [[ "$BUILD_MINGW" == true  ]]; then  cd nasm-2.14/ && ./configure && make && sudo make install && cd .. ; fi
-- if [[ "$BUILD_MINGW" == true  ]]; then ./configure --cross=x86_64-w64-mingw32 --enable-nvenc --enable-qsv --enable-vce --launch --launch-jobs=0 ; 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 ; fi
+- if [[ "$BUILD_MINGW" == true ]]; then cd nasm-2.14/ && ./configure && make && cd .. ; fi
+- if [[ "$BUILD_MINGW" == true ]]; then export PATH=$HOME/toolchains/mingw-w64-5.0.2-gcc-7.1.0/mingw-w64-x86_64/bin:$HOME/HandBrake/HandBrake/nasm-2.14/:$PATH ; fi
+- if [[ "$BUILD_MINGW" == true ]]; then ./configure --cross=x86_64-w64-mingw32 --enable-nvenc --enable-qsv --enable-vce --launch --launch-jobs=1 ; fi
+
+# Macos Build Support
+- if [[ "$TRAVIS_OS_NAME" == "osx" && ! -d "$HOME/toolchains/mingw-w64-5.0.2-gcc-7.1.0" ]]; then sudo ./scripts/mac-toolchain-build  ; fi
 
 cache:
   directories: