[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13773] trunk/blender/source/blender: Patche from Giuseppe Ghib?\195?\178 to look in /usr/lib64
Campbell Barton
ideasman42 at gmail.com
Tue Feb 19 22:18:35 CET 2008
Revision: 13773
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13773
Author: campbellbarton
Date: 2008-02-19 22:18:35 +0100 (Tue, 19 Feb 2008)
Log Message:
-----------
Patche from Giuseppe Ghib?\195?\178 to look in /usr/lib64
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/intern/dynlibtiff.c
trunk/blender/source/blender/imbuf/intern/gen_dynlibtiff.py
trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
Modified: trunk/blender/source/blender/imbuf/intern/dynlibtiff.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dynlibtiff.c 2008-02-19 20:35:19 UTC (rev 13772)
+++ trunk/blender/source/blender/imbuf/intern/dynlibtiff.c 2008-02-19 21:18:35 UTC (rev 13773)
@@ -83,13 +83,19 @@
/* 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 */
Modified: trunk/blender/source/blender/imbuf/intern/gen_dynlibtiff.py
===================================================================
--- trunk/blender/source/blender/imbuf/intern/gen_dynlibtiff.py 2008-02-19 20:35:19 UTC (rev 13772)
+++ trunk/blender/source/blender/imbuf/intern/gen_dynlibtiff.py 2008-02-19 21:18:35 UTC (rev 13773)
@@ -125,13 +125,19 @@
/* 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 */
Modified: trunk/blender/source/blender/yafray/intern/export_Plugin.cpp
===================================================================
--- trunk/blender/source/blender/yafray/intern/export_Plugin.cpp 2008-02-19 20:35:19 UTC (rev 13772)
+++ trunk/blender/source/blender/yafray/intern/export_Plugin.cpp 2008-02-19 21:18:35 UTC (rev 13773)
@@ -101,6 +101,9 @@
static char *alternative[]=
{
"/usr/local/lib/",
+#ifdef __x86_64__
+ "/usr/lib64/",
+#endif
"/usr/lib/",
NULL
};
@@ -124,6 +127,9 @@
static char *alternative[]=
{
"/usr/local/lib/yafray",
+#ifdef __x86_64__
+ "/usr/lib64/yafray",
+#endif
"/usr/lib/yafray",
NULL
};
More information about the Bf-blender-cvs
mailing list