Changeset 12004 for issm/branches/trunk-jpl-damage/externalpackages/triangle

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• externalpackages/triangle/configs/android (copied) (copied from issm/trunk-jpl/externalpackages/triangle/configs/android )
• externalpackages/triangle/install-android-4.0.sh (copied) (copied from issm/trunk-jpl/externalpackages/triangle/install-android-4.0.sh )
• externalpackages/triangle/install-macosx64.sh (modified) (2 diffs)
• externalpackages/triangle/makefile (modified) (2 diffs)
• externalpackages/triangle/triangle.c.patch.matlab (copied) (copied from issm/trunk-jpl/externalpackages/triangle/triangle.c.patch.matlab )
• externalpackages/triangle/triangle.c.patch.python (copied) (copied from issm/trunk-jpl/externalpackages/triangle/triangle.c.patch.python )
• externalpackages/triangle/triangle.h.patch (modified) (1 diff)

issm/branches/trunk-jpl-damage/externalpackages/triangle/install-macosx64.sh

@@ -1 +1 @@
 #!/bin/bash
+
+#use matlab? 
+matlab=0
+
 
 #Some cleanup 
@@ -15 +19 @@
 
 #Patch triangle.c 
-patch triangle.c ../triangle.c.patch
+if [[ $matlab == "1" ]];then
+        patch triangle.c ../triangle.c.patch.matlab
+else
+        patch triangle.c ../triangle.c.patch.python
+fi
 
 #Compile triangle

issm/branches/trunk-jpl-damage/externalpackages/triangle/makefile

@@ -4 +4 @@
 include ./configure.make
 
-AR = ar
+ifeq "$(origin CC)" "undefined"
+        CC = cc
+endif
+
+ifeq "$(origin AR)" "undefined"
+        AR = ar
+endif
+
+ifeq "$(origin RANLIB)" "undefined"
+        RANLIB = ranlib
+endif
 
 TRILIBDEFS = -DTRILIBRARY
@@ -13 +23 @@
 
 triangle.$(LIB_EXT): $(OBJECTS)
-        ar cr  triangle.$(LIB_EXT) $(OBJECTS)
-        ranlib triangle.$(LIB_EXT)
+        $(AR) cr  triangle.$(LIB_EXT) $(OBJECTS)
+        $(RANLIB) triangle.$(LIB_EXT)
 
 triangle.$(OBJ_EXT): triangle.c triangle.h

issm/branches/trunk-jpl-damage/externalpackages/triangle/triangle.h.patch

@@ -1 @@
-249a250,253
+249a250,251
+> #ifndef _TRIANGLE_LIBRARY_H_
+> #define _TRIANGLE_LIBRARY_H_
+251c253,259
+< struct triangulateio {
+---
+> 
 > #ifndef REAL
 > typedef double REAL;
 > typedef void VOID;
 > #endif
-251c255
-< struct triangulateio {
----
+> 
 > extern "C" struct triangulateio {
-283c287
+283c291
 < void triangulate(char *, struct triangulateio *, struct triangulateio *,
 ---
 > extern "C" void triangulate(char *, struct triangulateio *, struct triangulateio *,
-285c289
+285c293
 < void trifree(VOID *memptr);
 ---
 > extern "C" void trifree(VOID *memptr);
+289a298,300
+> 
+> 
+> #endif //#ifndef _TRIANGLE_LIBRARY_H_