[Bf-committers] Revised Diffs for testing OS X Plugins

Douglas Bischoff bf-committers@blender.org
Tue, 25 Nov 2003 12:59:03 -0500


Hello:

Revised diffs, simplifies the process.

You still need to install the dlcompat library, but once you have that 
these two diffs make it all work:

----
Index: dynlib.c
===================================================================
RCS file: 
/cvsroot/bf-blender/blender/source/blender/blenlib/intern/dynlib.c,v
retrieving revision 1.6
diff -u -u -r1.6 dynlib.c
--- dynlib.c    30 Apr 2003 15:55:50 -0000      1.6
+++ dynlib.c    25 Nov 2003 18:01:34 -0000
@@ -102,7 +102,7 @@
         free(lib);
  }

-#else
+/*#else
  #ifdef __APPLE__
  #include <mach-o/dyld.h>

@@ -157,6 +157,7 @@
         free(lib);
  }

+*/
  #else  /* Unix */

  #include <dlfcn.h>
@@ -192,5 +193,5 @@
         free(lib);
  }

-#endif
+//#endif
  #endif
----

Then

----
Index: bmake
===================================================================
RCS file: /cvsroot/bf-blender/blender/release/plugins/bmake,v
retrieving revision 1.4
diff -u -u -r1.4 bmake
--- bmake       21 Feb 2003 15:37:55 -0000      1.4
+++ bmake       25 Nov 2003 18:03:00 -0000
@@ -74,7 +74,7 @@
          CC="cc";
          CFLAGS="-fPIC -funsigned-char -O2 -fno-common";
          LD="cc";
-        LDFLAGS=" -bundle -bundle_loader 
../../blender.app/Contents/MacOS/blender -lm";
+        LDFLAGS="-flat_namespace -bundle -bundle_loader 
../../blender.app/Contents/MacOS/blender -ldl -lm";
          EXT="so";
  fi
----

Please let me know how things work out with this!

-Bischofftep