[Bf-committers] Last Shot for OS X Plugins

[Douglas Bischoff]

--Apple-Mail-2--864621300
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed

One more time:

This is just a cleaner version of that dynlib.c file.

Thanks for your patience everyone, and thanks again to sirdude and 
LarstiQ!!

-Bishofftep


--Apple-Mail-2--864621300
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="bmake.diff"
Content-Disposition: attachment;
	filename=bmake.diff

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:22:21 -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
 

--Apple-Mail-2--864621300
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed



--Apple-Mail-2--864621300
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="dynlib.diff"
Content-Disposition: attachment;
	filename=dynlib.diff

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:21:51 -0000
@@ -102,62 +102,7 @@
 	free(lib);
 }
 
-#else
-#ifdef __APPLE__
-#include <mach-o/dyld.h>
-
-struct PILdynlib {
-	NSModule *handle;
-};
-
-PILdynlib *PIL_dynlib_open(char *name) {
-   NSObjectFileImage img;
-
-   PILdynlib *lib= malloc(sizeof(*lib));
-   if (NSCreateObjectFileImageFromFile( name, &img) == 
-	NSObjectFileImageSuccess) {
-      lib->handle = NSLinkModule( img, name, NSLINKMODULE_OPTION_BINDNOW);
-      NSDestroyObjectFileImage(img);
-      return lib;
-   }
-   free(lib);
-   return NULL;
-}
-
-void *PIL_dynlib_find_symbol(PILdynlib* lib, char *symname) {
-   char *name;
-   NSSymbol cr;
-   int size;
-
-   size = strlen(symname) + 2 * sizeof(char);
-   if (size < CHAR_MAX) {
-      name = MEM_mallocN(size, symname);
-      sprintf(&name, "_%s",symname);
-printf("\nouchie name =%s\n",name);
-      cr = NSLookupSymbolInModule(lib->handle, name);
-      free(name);
-      return NSAddressOfSymbol(cr);
-   }
-   return NULL;
-}
-
-char *PIL_dynlib_get_error_as_string(PILdynlib* lib) {
-    char *string;
-    int *errorNumber;
-    NSLinkEditErrors *c;
-    char *filename, *errorstr;
-
-    NSLinkEditError(&c,&errorNumber,&filename,&errorstr);
-    sprintf(string,"%d :%s: %s",errorNumber,filename,errorstr);
-	return string;
-}
-	
-void PIL_dynlib_close(PILdynlib *lib) {
-	NSUnLinkModule(lib->handle,NSUNLINKMODULE_OPTION_NONE);
-	free(lib);
-}
-
-#else	/* Unix */
+#else	/* Unix & MacOS X */
 
 #include <dlfcn.h>
 
@@ -192,5 +137,5 @@
 	free(lib);
 }
 
-#endif
+//#endif
 #endif

--Apple-Mail-2--864621300--