Changeset 1797 in Sophya

Timestamp:

Nov 27, 2001, 10:19:36 PM (24 years ago)

Author:

aubourg

Message:

darwin

Location:

trunk

Files:

• SophyaLib/Mgr/Makefile.h (modified) (2 diffs)
• SophyaLib/Mgr/mkmfPI (modified) (2 diffs)
• SophyaLib/Mgr/mkmflib (modified) (2 diffs)
• SophyaLib/SysTools/cxxcmplnk.cc (modified) (1 diff)
• SophyaLib/SysTools/pdlmgr.cc (modified) (1 diff)
• SophyaPI/PIext/servnobjm.cc (modified) (1 diff)

trunk/SophyaLib/Mgr/Makefile.h

@@ -117 +117 @@
 AR       := ar
 ARFLAGS  := -rcs
+ARARGS   := ?
 
 # le gnu ar ne fonctionne pas bien sur OSF...
@@ -130 +131 @@
 AR := libtool
 ARFLAGS := -static -o
+ARARGS := ^
 EROSCXX := g++
 CXX := g++

trunk/SophyaLib/Mgr/mkmfPI

@@ -1 +1 @@
 #!/bin/csh
-# $Id: mkmfPI,v 1.6 2000-09-29 22:46:38 ansari Exp $
+# $Id: mkmfPI,v 1.7 2001-11-27 21:19:36 aubourg Exp $
 
 set makefname = 'GNUmakefile'
@@ -56 +56 @@
 
 echo $libf ':' $objfiles  >> $makefname
-echo '  $(AR) $(ARFLAGS)  $@ $? ' >> $makefname
+echo '  $(AR) $(ARFLAGS)  $@ $($(ARARGS)) ' >> $makefname
 echo 'ifeq ($(CXX),cxx)' >> $makefname
 # echo '        $(CXX) $? $(CPPFLAGS) $(CXXFLAGS)' $hfcxxlibs '-o $(OBJ)xx.x -Hf' >> $makefname

trunk/SophyaLib/Mgr/mkmflib

@@ -1 +1 @@
 #!/bin/csh
-# $Id: mkmflib,v 1.9 2000-09-29 22:46:38 ansari Exp $
+# $Id: mkmflib,v 1.10 2001-11-27 21:19:36 aubourg Exp $
 
 cd ../$1
@@ -57 +57 @@
 echo $libf ':' \
  `ls *.{c,cc} | comm -3 -1 $TMPDIR/exclude.sort - | sed -e 's/\.cc/.o/' | sed -e 's/\.c/.o/' | sed -e 's/^/$(OBJ)/'` >> GNUmakefile
-echo '  $(ARCXX) $(ARCXXFLAGS) $@ $?' >> GNUmakefile
+echo '  $(ARCXX) $(ARCXXFLAGS) $@ $($(ARARGS))' >> GNUmakefile
 #  Pour faire compiler les instantiations automatique de cxx (DEC)
 echo 'ifeq ($(CXX),cxx)' >> GNUmakefile

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -60 +60 @@
   cppFlags += "-DHPUX" ;
   syscomp = "HPUX-";  
+#elif defined(Darwin)
+  cppFlags += "-DDarwin";
+  syscomp = "Darwin-";
 #endif
 

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -172 +172 @@
   cmd = "ld -b -o " + fnameso + " " + fnameobj + " -lm -lc";
 #elif defined(Darwin)
-  cmd = "ld -bundle -o " + fnameso + " " + fnameobj + " -lm -lc";
+  cmd = "ld -bundle -o " + fnameso + " " + fnameobj + " -lm  -lcc_dynamic -lSystem -lbundle1.o";
 #else 
   cmd = "ld -o " + fnameso + " " + fnameobj + " -lm -lc";

trunk/SophyaPI/PIext/servnobjm.cc

@@ -948 +948 @@
 fputs("{return ((int_8)((v<0.) ? v-0.1 : v+0.1))&flg;}\n", fip);
 fputs("/* ------ Some random number generators --------- */ \n", fip);
+fputs("#if defined(__ppc__) && defined(__MACH__)",fip);
+fputs("#define drand48() ((double)(random())/LONG_MAX",fip);
+fputs("#endif",fip);
 fputs("#define frand01() ( (float) drand48() ) \n", fip);
 fputs("#define drand01() drand48()  \n", fip);