diff options
| author | Anton Fedchin <anightik@gmail.com> | 2018-04-17 23:13:08 +0300 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2018-04-19 08:37:44 +0200 |
| commit | 1aca122bb04b611bd8ebb275bdb0ca920a010314 (patch) | |
| tree | bd8a0f56e6dbf0f98ac84b92b113efdafce8da36 /tools/buildsteps/windows | |
| parent | c7e2acc1b2ee781af6e14d80da0edd0aa23bdf03 (diff) | |
[buildsteps] windows: fix ffmpeg 4.0 build
Diffstat (limited to 'tools/buildsteps/windows')
| -rw-r--r-- | tools/buildsteps/windows/patches/0003-ffmpeg-fix-msvc.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tools/buildsteps/windows/patches/0003-ffmpeg-fix-msvc.patch b/tools/buildsteps/windows/patches/0003-ffmpeg-fix-msvc.patch new file mode 100644 index 0000000000..eb816ce29a --- /dev/null +++ b/tools/buildsteps/windows/patches/0003-ffmpeg-fix-msvc.patch @@ -0,0 +1,16 @@ +diff --git a/configure b/configure +index 4c99a80..d036bc0 100644 +--- a/configure ++++ b/configure +@@ -4411,7 +4411,7 @@ probe_cc(){ + _flags_filter=msvc_flags + _ld_lib='lib%.a' + _ld_path='-libpath:' +- elif $_cc -nologo- 2>&1 | grep -q Microsoft || $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; then ++ elif $_cc -nologo- 2>&1 | grep -q Microsoft; then + _type=msvc + _ident=$($_cc 2>&1 | head -n1 | tr -d '\r') + _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)' +-- +2.14.1.windows.1 + |