Changeset 1900 in Sophya for trunk/SophyaLib/SysTools/cxxcmplnk.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/cxxcmplnk.cc (modified) (5 diffs)

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -36 +36 @@
 
 /* --Methode-- */
-CxxCompilerLinker::CxxCompilerLinker()
+CxxCompilerLinker::CxxCompilerLinker(bool fglibsophya, bool fglibextsophya, bool fglibpi)
   : verbose(false)
 {
@@ -92 +92 @@
 #endif
 
+#ifndef Darwin
+  linkCmd = compCmd;
+#else
+  linkCmd = "cc -bundle -flat_namespace -undefined suppress ";
+  linkOptions = "-L/usr/lib/gcc/darwin/default -lstdc++ -lcc_dynamic -lpthread -lm";
+#endif
+
   cppFlags += " -I. ";
   compOptions += " -c ";
@@ -102 +109 @@
     if (dpcbase[dpcbase.length()-1] != '/')  dpcbase += '/';
     cppFlags += ( " -I" + dpcbase + "Include/ ");
-    linkOptions += " -L" + dpcbase + syscomp + "ShLibs/ -lextsophya -lsophya -lm "; 
+    linkOptions += " -L" + dpcbase + syscomp + "ShLibs/";
+    if (fglibsophya) linkOptions += " -lsophya ";
+    if (fglibextsophya) linkOptions += " -lextsophya ";
+    if (fglibpi) linkOptions += " -lPI ";
   }
 
@@ -151 +161 @@
 int CxxCompilerLinker::BuildSO(string const & oname, string & soname)
 {
+  //  char * soext = ".dylib"; if defined(Darwin) - pas necessaire Reza 02/2002
+  char * soext = ".so";
+
   if (soname.length() < 1) {
     size_t l,p,q;
@@ -158 +171 @@
     else p++;
     q = oname.find('.');
-    if (q < l)  soname = tmpDir + oname.substr(p, q-p) + ".so";
-    else soname = tmpDir + oname.substr(p) + ".so";
+    if (q < l)  soname = tmpDir + oname.substr(p, q-p) + soext;
+    else soname = tmpDir + oname.substr(p) + soext;
   }
   string cmd;
-  cmd = compCmd + linkOptions + "-o " + soname + " " + oname ; 
+  cmd = linkCmd + " " + oname + " " + linkOptions + " -o " + soname + " " ; 
   if (verbose)
     cout << "CxxCompilerLinker::BuildSO() - Executing \n" << cmd << endl;