All pastes #910294 Raw Edit

Miscellany

public text v1 · immutable
·published 2008-02-19 21:16 UTC
rendered paste body
ndex: source/blender/yafray/intern/export_Plugin.cpp
===================================================================
--- source/blender/yafray/intern/export_Plugin.cpp      (revision 13768)
+++ source/blender/yafray/intern/export_Plugin.cpp      (working copy)
@@ -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
        };
Index: source/blender/imbuf/intern/gen_dynlibtiff.py
===================================================================
--- source/blender/imbuf/intern/gen_dynlibtiff.py       (revision 13768)
+++ source/blender/imbuf/intern/gen_dynlibtiff.py       (working copy)
@@ -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 */
Index: source/blender/imbuf/intern/dynlibtiff.c
===================================================================
--- source/blender/imbuf/intern/dynlibtiff.c    (revision 13768)
+++ source/blender/imbuf/intern/dynlibtiff.c    (working copy)
@@ -83,13 +83,21 @@
        /* 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
+
+       if (libtiff != NULL)  return;
        libtiff = PIL_dynlib_open("/usr/local/lib/libtiff.so");
        if (libtiff != NULL)  return;
        /* For solaris */