sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Patche from Giuseppe Ghibò to look in /usr/lib64

Browse Source
This commit is contained in:
Campbell Barton 2008-02-19 21:18:35 +00:00
parent 2283bdc09b
commit 190a35f690
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/imbuf/intern/dynlibtiff.c
View File

@ -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 */

8
source/blender/imbuf/intern/gen_dynlibtiff.py
View File

@ -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 */

6
source/blender/yafray/intern/export_Plugin.cpp
View File

@ -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
};