mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-11-10 19:56:47 +03:00
Move custom path of JPEG_ROOT, TIFF_ROOT, etc. before system.
This commit is contained in:
parent
d4c30b7171
commit
8b14c9721a
24
setup.py
24
setup.py
|
@ -91,6 +91,18 @@ class pil_build_ext(build_ext):
|
|||
|
||||
_add_directory(include_dirs, "libImaging")
|
||||
|
||||
#
|
||||
# add configured kits
|
||||
|
||||
for root in (TCL_ROOT, JPEG_ROOT, TCL_ROOT, TIFF_ROOT, ZLIB_ROOT,
|
||||
FREETYPE_ROOT, LCMS_ROOT):
|
||||
if isinstance(root, type(())):
|
||||
lib_root, include_root = root
|
||||
else:
|
||||
lib_root = include_root = root
|
||||
_add_directory(library_dirs, lib_root)
|
||||
_add_directory(include_dirs, include_root)
|
||||
|
||||
#
|
||||
# add platform directories
|
||||
|
||||
|
@ -165,18 +177,6 @@ class pil_build_ext(build_ext):
|
|||
else:
|
||||
TCL_ROOT = None
|
||||
|
||||
#
|
||||
# add configured kits
|
||||
|
||||
for root in (TCL_ROOT, JPEG_ROOT, TCL_ROOT, TIFF_ROOT, ZLIB_ROOT,
|
||||
FREETYPE_ROOT, LCMS_ROOT):
|
||||
if isinstance(root, type(())):
|
||||
lib_root, include_root = root
|
||||
else:
|
||||
lib_root = include_root = root
|
||||
_add_directory(library_dirs, lib_root)
|
||||
_add_directory(include_dirs, include_root)
|
||||
|
||||
#
|
||||
# add standard directories
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user