modified build scripts for mac and win32

.travis/after_success.sh

@@ -21,21 +21,21 @@ then
     echo "[INFO] Still current. Uploading..."
 
     # retrieve upload tool
-    wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+    #wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
 
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    #if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
         # upload final package
-        bash upload.sh Olive*.zip
+        #bash upload.sh Olive*.zip
 
-    elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    #elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
-        find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+        #find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
 
         # upload final package
-        bash upload.sh Olive*.AppImage*
+        #bash upload.sh Olive*.AppImage*
         
-    fi
+    #fi
 
 else
     

.travis/script.sh

@@ -16,7 +16,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     python2 macdeployqtfix.py Olive.app/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
 
     # Distribute in zip
-    zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
+    zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip app/Olive.app
 
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 

appveyor-build.bat

@@ -3,12 +3,17 @@ call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
 
 REM Install FFmpeg
-vcpkg install ffmpeg
+curl -L -o ffmpeg-shared.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-shared.zip
+curl -L -o ffmpeg-dev.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-dev.zip
+7z e ffmpeg-shared.zip
+7z e ffmpeg-dev.zip
 
 REM Install OpenColorIO
+curl -L -o ocio.zip https://github.com/olive-editor/OpenColorIO-Win32/releases/download/v1.1.1/ocio-v1.1.1-win64-shared.zip
+7z e ocio.zip
 
 REM Install OpenImageIO
-vcpkg install openimageio
+REM vcpkg install openimageio
 
 REM Run cmake
 cmake . -G "NMake Makefiles"