]> git.eshelyaron.com Git - emacs.git/commitdiff
Use HarfBuzz in Cygwin-w32 build
authorKen Brown <kbrown@cornell.edu>
Tue, 25 Jun 2024 15:30:08 +0000 (11:30 -0400)
committerEshel Yaron <me@eshelyaron.com>
Wed, 26 Jun 2024 13:34:23 +0000 (15:34 +0200)
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper) [CYGWIN]:
Use cygharfbuzz-0.dll as HarfBuzz DLL name instead of
libharfbuzz-0.dll. (Bug#71766)

(cherry picked from commit e7c85f9235af485baba6e398b4f509f14bf80b1c)

src/w32uniscribe.c

index b3112912c767c31c16beda66a4f66afa19c00973..dacd6dd766ed5fd2b28ef54d83cfc9f7eb33d160 100644 (file)
@@ -1527,12 +1527,17 @@ syms_of_w32uniscribe_for_pdumper (void)
     uniscribe_new_apis = false;
 
 #ifdef HAVE_HARFBUZZ
-  /* Currently, HarfBuzz DLLs are always named libharfbuzz-0.dll, as
+  /* Currently, HarfBuzz DLLs are always named libharfbuzz-0.dll on
+     MS-Windows and cygharfbuzz-0.dll on Cygwin, as
      the project keeps the ABI backward-compatible.  So we can
      hard-code the name of the library here, for now.  If they ever
      break ABI compatibility, we may need to load the DLL that
      corresponds to the HarfBuzz version for which Emacs was built.  */
+# ifdef WINDOWSNT
   HMODULE harfbuzz = LoadLibrary ("libharfbuzz-0.dll");
+# else /* CYGWIN */
+  HMODULE harfbuzz = LoadLibrary ("cygharfbuzz-0.dll");
+# endif /* CYGWIN */
   /* Don't register if HarfBuzz is not available.  */
   if (!harfbuzz)
     return;