Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect libimagequant when installed by pacman on MingW #3812

Merged
merged 1 commit into from May 4, 2019
Merged

Detect libimagequant when installed by pacman on MingW #3812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions setup.py
View file
Open in desktop
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion winbuild/appveyor_install_msys2_deps.sh
View file
Open in desktop
Expand Up @@ -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

Expand Down