diff options
| author | Anton Fedchin <anightik@gmail.com> | 2018-06-05 08:22:39 +0300 |
|---|---|---|
| committer | Anton Fedchin <anightik@gmail.com> | 2018-06-05 08:23:25 +0300 |
| commit | 84302bac1ea85c0d7fa84d1cc7fcf37007e78d01 (patch) | |
| tree | 87db4df56601acd5c52532c9cb0486da4ae81bf5 /tools/buildsteps | |
| parent | 05a868b338196c7006913ac40945e6309b07cb96 (diff) | |
[tools] win32: build ffmpeg with openssl instead of schannel
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/windows/buildffmpeg.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/buildsteps/windows/buildffmpeg.sh b/tools/buildsteps/windows/buildffmpeg.sh index 953e6b692f..cd3bae5272 100644 --- a/tools/buildsteps/windows/buildffmpeg.sh +++ b/tools/buildsteps/windows/buildffmpeg.sh @@ -78,10 +78,11 @@ do_removeOption() { do_getFFmpegConfig +# enable OpenSSL, because schannel has issues do_removeOption "--enable-gnutls" -do_removeOption "--enable-openssl" do_addOption "--disable-gnutls" -do_addOption "--disable-openssl" +do_addOption "--enable-openssl" +do_addOption "--enable-nonfree" do_addOption "--toolchain=msvc" if [ "$ARCH" == "x86_64" ]; then @@ -96,13 +97,9 @@ export CFLAGS="" export CXXFLAGS="" export LDFLAGS="" -extra_cflags="-I$LOCALDESTDIR/include -I/depends/$TRIPLET/include" +extra_cflags="-I$LOCALDESTDIR/include -I/depends/$TRIPLET/include -DWIN32_LEAN_AND_MEAN" extra_ldflags="-LIBPATH:\"$LOCALDESTDIR/lib\" -LIBPATH:\"$MINGW_PREFIX/lib\" -LIBPATH:\"/depends/$TRIPLET/lib\"" if [ $win10 == "yes" ]; then - # enable OpenSSL on UWP, because schannel isn't available - do_removeOption "--disable-openssl" - do_addOption "--enable-openssl" - do_addOption "--enable-nonfree" do_addOption "--enable-cross-compile" extra_cflags=$extra_cflags" -MD -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WIN32_WINNT=0x0A00" extra_ldflags=$extra_ldflags" -APPCONTAINER WindowsApp.lib" |