From 6f0612fa104e6c0317e62bbaab98bc5d10038cb6 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 27 Jan 2020 00:33:55 +0100 Subject: [PATCH] Fix path to ffmpeg headers and attempt to reduce compile time ffmpeg --- CMakeLists.txt | 3 ++- appveyor.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79ac8fcc..371e20b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,8 @@ if(WIN32) C:/msys64/mingw64/lib/libiconv.a ) - set(FFMPEG_INCLUDE_DIRS /usr/local/include) + set(FFMPEG_INCLUDE_DIRS + C:/msys64/usr/local/include) set(FFMPEG_LIBRARIES C:/msys64/usr/local/lib/libavcodec.a C:/msys64/usr/local/lib/libavdevice.a diff --git a/appveyor.yml b/appveyor.yml index c37c3031..7ddbd363 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ build_script: - cmd: C:\msys64\usr\bin\bash -lc "git clone --single-branch --branch release/4.2 https://github.com/FFmpeg/FFmpeg.git" - cmd: C:\msys64\usr\bin\bash -lc "export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/System32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0/:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl && mkdir -p x265/cmake-build && cd x265/cmake-build && cmake -G'Unix Makefiles' ../source && make -j2" - cmd: C:\msys64\usr\bin\bash -lc "export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/System32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0/:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl && cd x264 && ./configure --enable-static --disable-cli --host=mingw64 && make -j2 && make install" - - cmd: C:\msys64\usr\bin\bash -lc "export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/System32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0/:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl && cd FFmpeg && ./configure --disable-programs --enable-static --disable-shared --enable-libx264 --enable-libx265 --enable-nonfree --enable-gpl --extra-cflags=-I../x264 --extra-ldflags=-L../x264 --target-os=mingw64 && make -j2 && make install" + - cmd: C:\msys64\usr\bin\bash -lc "export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/System32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0/:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl && cd FFmpeg && ./configure --disable-decoders --disable-encoders --disable-hwaccels --disable-doc --disable-programs --enable-static --disable-shared --enable-libx264 --enable-libx265 --enable-nonfree --enable-gpl --extra-cflags=-I../x264 --extra-ldflags=-L../x264 --target-os=mingw64 && make -j2 && make install" - cmd: set OLDPATH=%PATH% - cmd: set PATH=C:\msys64\mingw64\bin - sh: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..