Merge pull request #2322 from Kozea/windows-build

Improve Windows build
Kozea · Dec 9, 2024 · 3c6f9a5 · 3c6f9a5
2 parents 003ff42 + df39db3
commit 3c6f9a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/exe.yml b/.github/workflows/exe.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install requirements
         run: python -m pip install . pyinstaller
       - name: Generate executable
-        run: python -m PyInstaller weasyprint/__main__.py -n weasyprint -F --hidden-import "fontTools.ttLib.tables.V_A_R_C_"
+        run: python -m PyInstaller weasyprint/__main__.py -n weasyprint -F
       - name: Test executable
         run: dist/weasyprint --info
       - name: Store executable

diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py
@@ -1,6 +1,7 @@
 """Imports of dynamic libraries used for text layout."""
 
 import os
+import sys
 from contextlib import suppress
 
 import cffi
@@ -434,7 +435,7 @@ def _dlopen(ffi, *names, allow_fail=False):
     return ffi.dlopen(names[0], flags)  # pragma: no cover
 
 
-if hasattr(os, 'add_dll_directory'):  # pragma: no cover
+if hasattr(os, 'add_dll_directory') and not hasattr(sys, 'frozen'):  # pragma: no cover
     dll_directories = os.getenv(
         'WEASYPRINT_DLL_DIRECTORIES',
         'C:\\msys64\\mingw64\\bin;'