Changeset 12056

Timestamp:

04/18/12 16:13:44 (13 years ago)

Author:

seroussi

Message:

fixed compilation on pleiades

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/TriMeshx/TriMeshx.cpp (modified) (1 diff)
• modules/TriMeshx/TriMeshx.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -924 +924 @@
 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
 
+if MODULES
 libISSMModules_a_SOURCES = $(module_sources)
 libISSMModules_a_SOURCES += $(bamg_sources)
 libISSMModules_a_SOURCES += $(kml_sources)
 libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS)
+endif
 
 if PYTHON

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp

@@ -10 +10 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
+/*ANSI_DECLARATORS needed to call triangle library: */
+#ifndef ANSI_DECLARATORS
+#define ANSI_DECLARATORS
+#include "triangle.h"
+#undef ANSI_DECLARATORS
+#else
+#include "triangle.h"
+#endif
 /*}}}*/
 

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.h

@@ -5 +5 @@
 #ifndef _TRIMESHX_H_
 #define _TRIMESHX_H_
-
-
-
-/*ANSI_DECLARATORS needed to call triangle library: */
-#ifndef ANSI_DECLARATORS
-#define ANSI_DECLARATORS
-#include "triangle.h"
-#undef ANSI_DECLARATORS
-#else
-#include "triangle.h"
-#endif
 
 #include "string.h"