diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-02-20 00:18:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-20 00:18:35 +0300 |
| commit | 190a35f690b1048a32547a4cb0de369e3f7dde4b (patch) | |
| tree | 73c355646c9e66e085b9e5415ad217cd2daaf184 /source/blender | |
| parent | 2283bdc09b48033c4de0e98e1bfd53b7fb382e25 (diff) | |
Patche from Giuseppe Ghibò to look in /usr/lib64
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/imbuf/intern/dynlibtiff.c | 8 | ||||
| -rwxr-xr-x | source/blender/imbuf/intern/gen_dynlibtiff.py | 8 | ||||
| -rw-r--r-- | source/blender/yafray/intern/export_Plugin.cpp | 6 |
3 files changed, 20 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/dynlibtiff.c b/source/blender/imbuf/intern/dynlibtiff.c index cdcb995bcff..4a96af8bf2b 100644 --- a/source/blender/imbuf/intern/dynlibtiff.c +++ b/source/blender/imbuf/intern/dynlibtiff.c @@ -83,13 +83,19 @@ void libtiff_loadlibtiff(void) /* Try to find libtiff in a couple of standard places */ 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.dll"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("/usr/lib/libtiff.so"); if (libtiff != NULL) return; - /* OSX has version specific library */ libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3"); if (libtiff != NULL) return; + /* OSX has version specific library */ +#ifdef __x86_64__ + libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.3"); + if (libtiff != NULL) return; +#endif libtiff = PIL_dynlib_open("/usr/local/lib/libtiff.so"); if (libtiff != NULL) return; /* For solaris */ diff --git a/source/blender/imbuf/intern/gen_dynlibtiff.py b/source/blender/imbuf/intern/gen_dynlibtiff.py index 1ee0275854a..de3236da6c2 100755 --- a/source/blender/imbuf/intern/gen_dynlibtiff.py +++ b/source/blender/imbuf/intern/gen_dynlibtiff.py @@ -125,13 +125,19 @@ void libtiff_loadlibtiff(void) /* Try to find libtiff in a couple of standard places */ 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.dll"); if (libtiff != NULL) return; libtiff = PIL_dynlib_open("/usr/lib/libtiff.so"); if (libtiff != NULL) return; - /* OSX has version specific library */ libtiff = PIL_dynlib_open("/usr/lib/libtiff.so.3"); if (libtiff != NULL) return; + /* OSX has version specific library */ +#ifdef __x86_64__ + libtiff = PIL_dynlib_open("/usr/lib64/libtiff.so.3"); + if (libtiff != NULL) return; +#endif libtiff = PIL_dynlib_open("/usr/local/lib/libtiff.so"); if (libtiff != NULL) return; /* For solaris */ diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp index abfdb5ed5dc..361939df9c4 100644 --- a/source/blender/yafray/intern/export_Plugin.cpp +++ b/source/blender/yafray/intern/export_Plugin.cpp @@ -101,6 +101,9 @@ static string YafrayPath() static char *alternative[]= { "/usr/local/lib/", +#ifdef __x86_64__ + "/usr/lib64/", +#endif "/usr/lib/", NULL }; @@ -124,6 +127,9 @@ static string YafrayPluginPath() static char *alternative[]= { "/usr/local/lib/yafray", +#ifdef __x86_64__ + "/usr/lib64/yafray", +#endif "/usr/lib/yafray", NULL }; |