From 8b14c9721aeccb31c33f28eb5672a43af99b05fc Mon Sep 17 00:00:00 2001 From: Alex Po Date: Wed, 9 Jan 2013 15:48:06 +0400 Subject: [PATCH] Move custom path of JPEG_ROOT, TIFF_ROOT, etc. before system. --- setup.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py index 79f659146..c9b69573a 100644 --- a/setup.py +++ b/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