diff options
Diffstat (limited to 'source/blender/imbuf/intern/dynlibtiff.c')
| -rw-r--r-- | source/blender/imbuf/intern/dynlibtiff.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/dynlibtiff.c b/source/blender/imbuf/intern/dynlibtiff.c index 6db83b37c05..31da262ffdb 100644 --- a/source/blender/imbuf/intern/dynlibtiff.c +++ b/source/blender/imbuf/intern/dynlibtiff.c @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Contributor(s): Jonathan Merritt. * @@ -85,40 +85,58 @@ void libtiff_loadlibtiff(void) if (libtiff != NULL) return; libtiff = PIL_dynlib_open("/usr/local/lib/libtiff.3.dylib"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("/usr/local/lib/libtiff.4.dylib"); + if (libtiff != NULL) return; //inside the blender app package contents/resources libtiff = PIL_dynlib_open("@executable_path/../resources/libtiff.dylib"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("@executable_path/../resources/libtiff.3.dylib"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("@executable_path/../resources/libtiff.4.dylib"); + if (libtiff != NULL) return; //inside the blender app package contents/frameworks libtiff = PIL_dynlib_open("@executable_path/../frameworks/libtiff.dylib"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("@executable_path/../frameworks/libtiff.3.dylib"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("@executable_path/../frameworks/libtiff.4.dylib"); + if (libtiff != NULL) return; //along side the blender app package libtiff = PIL_dynlib_open("@executable_path/../../../libtiff.dylib"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("@executable_path/../../../libtiff.3.dylib"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("@executable_path/../../../libtiff.4.dylib"); + if (libtiff != NULL) return; //inside the blender app package contents/MacOS libtiff = PIL_dynlib_open("@executable_path/libtiff.dylib"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("@executable_path/libtiff.3.dylib"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("@executable_path/libtiff.4.dylib"); + if (libtiff != NULL) return; #else libtiff = PIL_dynlib_open("libtiff.so"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("libtiff.so.3"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("libtiff.so.4"); + if (libtiff != NULL) return; libtiff = PIL_dynlib_open("libtiff.dll"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("/usr/lib/libtiff.so"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.4"); + if (libtiff != NULL) return; #ifdef __x86_64__ + libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so"); + if (libtiff != NULL) return; libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.3"); if (libtiff != NULL) return; + libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.4"); + if (libtiff != NULL) return; #endif libtiff = PIL_dynlib_open("/usr/local/lib/libtiff.so"); if (libtiff != NULL) return; |