[MOAB-dev] r5122 - in MOAB/trunk: . examples/itaps itaps/imesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-08-26 11:46:04 -0500 (Fri, 26 Aug 2011)
New Revision: 5122

Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/examples/itaps/Makefile.am
   MOAB/trunk/itaps/imesh/iMesh_f.h
Log:
make fortran examples work on 64-bit

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2011-08-26 13:31:35 UTC (rev 5121)
+++ MOAB/trunk/configure.ac	2011-08-26 16:46:04 UTC (rev 5122)
@@ -230,6 +230,11 @@
   fi
 fi
 
+AM_FCFLAGS="$AM_FCFLAGS -DPTRSIZE=${SIZEOF_VOID_P}"
+AM_FFLAGS="$AM_FFLAGS -DPTRSIZE=${SIZEOF_VOID_P}"
+AC_SUBST(AM_FCFLAGS)
+AC_SUBST(AM_FFLAGS)
+
 ################################################################################
 #                              Version Stuff
 ################################################################################

Modified: MOAB/trunk/examples/itaps/Makefile.am
===================================================================
--- MOAB/trunk/examples/itaps/Makefile.am	2011-08-26 13:31:35 UTC (rev 5121)
+++ MOAB/trunk/examples/itaps/Makefile.am	2011-08-26 16:46:04 UTC (rev 5122)
@@ -4,7 +4,7 @@
 	-I$(top_srcdir)/itaps/ \
 	-I$(top_builddir)/itaps/imesh
 
-AM_FFLAGS = -fcray-pointer
+AM_FFLAGS += -fcray-pointer
 
 TESTS = $(check_PROGRAMS)
 LDADD = $(top_builddir)/itaps/imesh/libiMesh.la $(top_builddir)/src/libMOAB.la ${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}

Modified: MOAB/trunk/itaps/imesh/iMesh_f.h
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh_f.h	2011-08-26 13:31:35 UTC (rev 5121)
+++ MOAB/trunk/itaps/imesh/iMesh_f.h	2011-08-26 16:46:04 UTC (rev 5122)
@@ -1,9 +1,9 @@
 #ifndef IMESH_F_H
 #define IMESH_F_H
 
-#define iMesh_Instance integer
-#define iBase_EntityIterator integer
-#define iBase_EntityArrIterator integer
+#define iMesh_Instance integer*PTRSIZE
+#define iBase_EntityIterator integer*PTRSIZE
+#define iBase_EntityArrIterator integer*PTRSIZE
 
 #endif