[cig-commits] r17030 - in mc/2D/ConMan/trunk/src: . mm.src

[becker at geodynamics.org]

Author: becker
Date: 2010-07-08 14:12:00 -0700 (Thu, 08 Jul 2010)
New Revision: 17030

Modified:
   mc/2D/ConMan/trunk/src/Makefile-ifort
   mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort
Log:
More fixes to 32 bit compile



Modified: mc/2D/ConMan/trunk/src/Makefile-ifort
===================================================================
--- mc/2D/ConMan/trunk/src/Makefile-ifort	2010-07-08 19:49:18 UTC (rev 17029)
+++ mc/2D/ConMan/trunk/src/Makefile-ifort	2010-07-08 21:12:00 UTC (rev 17030)
@@ -9,7 +9,7 @@
         vadd.o mydate.o mytime.o projct.o prj4q.o print_reg.o prtstr_reg.o \
         batchelor.o 
 
-SRC_HOME=$HOME/ConMann
+SRC_HOME=$(HOME)/ConMan
 
 IMPLICIT=f_tlhs.o f_trhsimp.o
 PICARD=f_tlhs.o f_trhsimp.o
@@ -32,7 +32,7 @@
 	(cd solver.src ; make -f Makefile.ifort)
 	(cd mm.src ; make -f Makefile.ifort)
 	(cd grid.src ; make -f Makefile.ifort)
-	$(FC) -I$(SRC_HOME)/libs -o conman.exp  rheol.newt.o timdrv.o $(COMMON) $(EXPLICIT) $(LIBS)
+	$(FC)  -static -I$(SRC_HOME)/libs -o conman.exp  rheol.newt.o timdrv.o $(COMMON) $(EXPLICIT) $(LIBS) 
 
 picard: $(COMMON) $(PICARD) rheol.newt.o timdrv.o
 	(cd solver.src ; make -f Makefile.ifort)

Modified: mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort
===================================================================
--- mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort	2010-07-08 19:49:18 UTC (rev 17029)
+++ mc/2D/ConMan/trunk/src/mm.src/Makefile.ifort	2010-07-08 21:12:00 UTC (rev 17030)
@@ -4,7 +4,8 @@
 FC=ifort
 FFLAGS=-O2 
 CFLAGS= 
-CC=gcc 
+#CC=gcc 
+CC=icc
 
 MEMORY_MANAGER=mmsc.o mm2000.o driver.o
 ../libs/libmm.a: $(MEMORY_MANAGER)