[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

Stephane Popinet s.popinet at niwa.co.nz
Fri May 15 02:52:30 UTC 2009


The following commit has been merged in the upstream branch:
commit 9f7e56b8ac1872d6b7d4b1e9bc937f2f98750818
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Aug 26 11:26:20 2005 +1000

    Compilation of functions on MacOSX
    
    darcs-hash:20050826012620-fbd8f-869b7aec964bf8940ff1ce4ce8f6c0202a95fb29.gz

diff --git a/THANKS b/THANKS
index 2b21568..5ce0892 100644
--- a/THANKS
+++ b/THANKS
@@ -3,3 +3,4 @@ following people (in random order):
 
 Dan Kelley
 R Sai Kiran
+David Sterling
diff --git a/src/utils.c b/src/utils.c
index beda962..9549735 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -248,8 +248,12 @@ static gint compile (GtsFile * fp, GfsFunction * f, const gchar * finname)
     "gerris2D3"
 #else /* 3D */
     "gerris3D"
-#endif 
+#endif
+#if defined(__APPLE__) && defined(__MACH__)
+    " --cflags --libs` -O -fPIC -bundle -x c";
+#else  /* not MACOSX */
     " --cflags --libs` -O -fPIC -shared -x c";
+#endif /* not MACOSX*/
   
   foutd = mkstemp (foutname);
   ferrd = mkstemp (ferrname);

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list