Changeset 1900 in Sophya for trunk/SophyaLib/SysTools/pdlmgr.cc

Timestamp:

Feb 15, 2002, 6:35:01 PM (24 years ago)

Author:

ansari

Message:

Portage sous Mac OS X - Reza 15/02/2002

File:

• trunk/SophyaLib/SysTools/pdlmgr.cc (modified) (7 diffs)

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -15 +15 @@
 static const char* sofext = ".so";
 static const char* sofext_HPUX = ".sl";
-static const char* sofext_Darwin = ".bundle";
+// static const char* sofext_Darwin = ".dylib"; pas necessaire - Reza 02/2002
 
 // Variables et methodes static
@@ -172 +172 @@
   cmd = "ld -b -o " + fnameso + " " + fnameobj + " -lm -lc";
 #elif defined(Darwin)
-  cmd = "ld -bundle -o " + fnameso + " " + fnameobj + " -lm  -lcc_dynamic -lSystem -lbundle1.o";
+  cmd = "cc -bundle -flat_namespace -o " + fnameso + " " + fnameobj + " -lm  -lcc_dynamic -lSystem -lbundle1.o";
 #else 
   cmd = "ld -o " + fnameso + " " + fnameobj + " -lm -lc";
@@ -203 +203 @@
 #ifdef HPUX
   soname += sofext_HPUX;
-#elif defined(Darwin)
- soname += sofext_Darwin;
 #else
   soname += sofext;
@@ -230 +228 @@
 else fnameso = soname;
 copy = cp;
+ fnameso = soname;
 soName = fnameso;
 
@@ -236 +235 @@
 cerr << "PDynLinkMgr::PDynLinkMgr() Not yet available on HP-UX " << endl;
 return;
-#elif defined(Darwin)
- int rc = NSCreateObjectFileImageFromFile(fnameso.c_str(), &shfim);
- if (rc != NSObjectFileImageSuccess) {
-   cerr << "PDynLinkMgr::PDynLinkMgr(): Error opening SO " << fnameso
-        << " (" << soname << ")" << endl;
-   cerr << "Loader Error (dlerror()) :" << rc << endl;
-   return;
- }
- shmod = NSLinkModule(shfim, fnameso.c_str(), 0);
 #else
 dlhandle =  dlopen(fnameso.c_str(), RTLD_NOW);
@@ -265 +255 @@
 cerr << "PDynLinkMgr::~PDynLinkMgr() Not yet available on HP-UX " << endl;
 return;
-#elif defined(Darwin)
- NSUnLinkModule(shmod, 0);
- NSDestroyObjectFileImage(shfim);
 #else
 if (dlhandle) dlclose(dlhandle);    dlhandle = NULL;
@@ -286 +273 @@
 cerr << "PDynLinkMgr::GetFunction() Not yet available on HP-UX " << endl;
 return f;
-#elif defined(Darwin)
- void* sym = NSLookupSymbolInModule(shmod,funcname.c_str());
- f = (DlFunction) NSAddressOfSymbol(sym);
- return f;
-#else
+#else 
+#if defined(Darwin)
+string funame = "_" + funcname;
+#else 
+string & funame = funcname;
+#endif
 if (dlhandle != NULL)  
-  f = (DlFunction)dlsym(dlhandle, funcname.c_str());
+  f = (DlFunction)dlsym(dlhandle, funame.c_str());
 if (f == NULL) cerr << "PDynLinkMgr::GetFunction(): Error linking " << funcname << endl;
 return(f);