diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-10-22 15:41:00 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-10-22 15:41:00 +0300 |
| commit | 2bffa0189dec332f0026c144f081493e2b7fe94b (patch) | |
| tree | 6d291ac6c41c794f7a9a4157b32af735e3ca29d4 /nt | |
| parent | bc2a5c112796ea9f072984b471f980e4321263b3 (diff) | |
| download | emacs-2bffa0189dec332f0026c144f081493e2b7fe94b.tar.gz | |
Fix WebP support on MS-Windows
* src/image.c (WebPDecodeRGBA, WebPDecodeRGB, WebPFree): Use
correct names and argument lists in DEF_DLL_FN; fix typos.
(WebPGetFeaturesInternal): Load this instead of WebPGetFeatures,
which is a static inline function in webp/decode.h.
(WebPGetFeatures): Redirect to call WebPGetFeaturesInternal.
* lisp/term/w32-win.el (dynamic-library-alist): Fix the name of
the WebP symbol.
* configure.ac (HAVE_WEBP): Fix detection of libwebp on MinGW.
* nt/INSTALL.W64:
* nt/INSTALL: Update information about libwebp availability.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/INSTALL | 10 | ||||
| -rw-r--r-- | nt/INSTALL.W64 | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nt/INSTALL b/nt/INSTALL index a39057c66c6..5a76f5bdeda 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -737,10 +737,18 @@ build will run on Windows 9X and newer systems). without it by specifying the --without-rsvg switch to the configure script. - For WebP images you will need libwebp: + For WebP images you will need libwebp. You can find it here: + + http://sourceforge.net/projects/ezwinports/files/ + + Note: the MS-Windows binary distribution on the Google site: https://developers.google.com/speed/webp/ + were compiled by MSVC, and include only static libraries, no DLLs. + So you cannot use that to build Emacs with WebP support on + MS-Windows, as that needs libwebp as a DLL. + Binaries for the other image libraries can be found on the ezwinports site or at the GnuWin32 project (the latter are generally very old, so not recommended). Note specifically that, due to some diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64 index 8f0d0c9528f..c3845d5b177 100644 --- a/nt/INSTALL.W64 +++ b/nt/INSTALL.W64 @@ -51,6 +51,7 @@ packages (you can copy and paste it into the shell with Shift + Insert): mingw-w64-x86_64-libpng \ mingw-w64-x86_64-libjpeg-turbo \ mingw-w64-x86_64-librsvg \ + mingw-w64-x86_64-libwebp \ mingw-w64-x86_64-lcms2 \ mingw-w64-x86_64-jansson \ mingw-w64-x86_64-libxml2 \ |