Merge pull request #3812 from radarhere/mingw

Detect libimagequant when installed by pacman on MingW
python-pillow · May 4, 2019 · a879c4c · a879c4c
2 parents 9077a80 + 303465d
commit a879c4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -439,9 +439,13 @@ def build_extensions(self):
             # alpine, at least
             _add_directory(library_dirs, "/lib")
 
-        # on Windows, look for the OpenJPEG libraries in the location that
-        # the official installer puts them
         if sys.platform == "win32":
+            if PLATFORM_MINGW:
+                _add_directory(include_dirs,
+                               "C:\\msys64\\mingw32\\include\\libimagequant")
+
+            # on Windows, look for the OpenJPEG libraries in the location that
+            # the official installer puts them
             program_files = os.environ.get('ProgramFiles', '')
             best_version = (0, 0)
             best_path = None

diff --git a/winbuild/appveyor_install_msys2_deps.sh b/winbuild/appveyor_install_msys2_deps.sh
@@ -5,7 +5,8 @@ pacman -S --noconfirm mingw32/mingw-w64-i686-python3-pip \
 	   mingw32/mingw-w64-i686-python3-setuptools \
 	   mingw32/mingw-w64-i686-python2-pip \
 	   mingw32/mingw-w64-i686-python2-setuptools \
-	   mingw-w64-i686-libjpeg-turbo
+	   mingw-w64-i686-libjpeg-turbo \
+	   mingw-w64-i686-libimagequant
 
 C:/msys64/mingw32/bin/python3 -m pip install --upgrade pip