diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-12 03:13:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 03:13:34 -0700 |
| commit | 637963244b5442d41f876b41f2622654e88f3074 (patch) | |
| tree | dbdc23ac9301748e06911a9d3fff05cd507b9121 /ports/ffmpeg/create-lib-libraries.patch | |
| parent | 7f02290c438845098b2b843152bd3bea96081af0 (diff) | |
| parent | 0e000644053015b7f7a0985e14f0bd384c847d17 (diff) | |
| download | vcpkg-637963244b5442d41f876b41f2622654e88f3074.tar.gz vcpkg-637963244b5442d41f876b41f2622654e88f3074.zip | |
Merge pull request #4217 from ptahmose/master
[ffmpeg] Add feature to build "ffmpeg.exe"
Diffstat (limited to 'ports/ffmpeg/create-lib-libraries.patch')
| -rw-r--r-- | ports/ffmpeg/create-lib-libraries.patch | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ports/ffmpeg/create-lib-libraries.patch b/ports/ffmpeg/create-lib-libraries.patch index dcc767cd2..ccad5ff8c 100644 --- a/ports/ffmpeg/create-lib-libraries.patch +++ b/ports/ffmpeg/create-lib-libraries.patch @@ -12,8 +12,20 @@ diff --git a/configure b/configure index ba38a73906..0a3f308323 100755 --- a/configure +++ b/configure -@@ -5031,6 +5031,8 @@ case $target_os in - fi +@@ -4890,15 +4890,17 @@ + ;; + win32|win64) + disable symver +- if enabled shared; then ++# if enabled shared; then + # Link to the import library instead of the normal static library + # for shared libs. + LD_LIB='%.lib' + # Cannot build both shared and static libs with MSVC or icl. +- disable static +- fi ++# disable static ++# fi enabled x86_32 && check_ldflags -LARGEADDRESSAWARE shlibdir_default="$bindir_default" + LIBPREF="" |