--- imach/src/Makefile	2015/01/04 09:35:04	1.53
+++ imach/src/Makefile	2015/03/10 20:35:56	1.56
@@ -1,5 +1,5 @@
-VERSION=0.98p
-COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)
+VERSION=0.98q0
+COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121, Intel Software 2015)
 #IMACHSETUPVERSION=ilc64
 IMACHSETUPVERSION=mvc
 
@@ -42,7 +42,8 @@ IMACHSETUPVERSION=mvc
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
 #TESTFILE=$$HOME/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach
-TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
@@ -55,6 +56,7 @@ LFLAGS= -g -lm
 CFLAGS= -g -DDEBUG 
 LFLAGSOPT= -O3 -lm 
 CFLAGSOPT= -O3 
+CROSSCOMPILATION= -DCROSS=0
 UNIX2DOS= echo "Unix2dos " 
 DSYMUTIL= dsymutil
 STRIP= strip
@@ -90,6 +92,7 @@ LFLAGS= -g
 CFLAGS= -g
 LFLAGSOPT= -O3 -lm
 CFLAGSOPT= -O3
+CROSSCOMPILATION= -DCROSS=1
 CP= cp
 UNIX2DOS= unix2dos
 SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
@@ -105,6 +108,7 @@ LFLAGS= -g
 CFLAGS= -g
 LFLAGSOPT= -O3 -s
 CFLAGSOPT= -O3
+CROSSCOMPILATION= -DCROSS=1
 UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp
@@ -118,6 +122,7 @@ LFLAGS= -g
 CFLAGS= -g
 LFLAGSOPT= -O3 -lm -s
 CFLAGSOPT= -O3
+CROSSCOMPILATION= -DCROSS=1
 UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp
@@ -191,6 +196,7 @@ LFLAGS= -g
 CFLAGS= -g
 LFLAGSOPT= -O3 -s -lm
 CFLAGSOPT= -O3
+CROSSCOMPILATION= -DCROSS=1
 TAR= /sw/bin/gnutar
 UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac
@@ -200,7 +206,8 @@ endif
 
 ifdef _linux
 #CFLAGS= -g -DUNIX -DDEBUGHESS
-CFLAGS= -g -DDEBUG
+#CFLAGS= -g -DDEBUG -DFIXMNBRAK
+CFLAGS= -g -DDEBUG 
 LFLAGS= -g -lm
 IGSL= -I/usr/include/gsl
 LGSL= -lgsl -lgslcblas
@@ -208,6 +215,7 @@ INLOPT= -I/usr/local/include
 LNLOPT= -lm -L/usr/local/lib -lnlopt
 CFLAGSOPT= -O3 -g
 LFLAGSOPT= -O3 -g -lm
+CROSSCOMPILATION= -DCROSS=0
 UNIX2DOS= unix2dos
 SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 BINVERSION=LINUXnative
@@ -327,14 +335,25 @@ simach : simach.o
 simach.o : simach.c 
 	$(CC) $(CFLAGS) -DGSL -c simach.c
 
-imach : imach.o 
+imachtest: imachtest.o 
+	$(CC) $(LFLAGS) -o imachtest imachtest.o
+ifdef _macosx
+	$(DSYMUTIL) imachtest
+endif
+
+imach: imach.o 
 	$(CC) $(LFLAGS) -o imach imach.o
 ifdef _macosx
 	$(DSYMUTIL) imach
 endif
 
 imach.o : imach.c 
-	 $(CC) $(CFLAGS) -DPOWELL -c imach.c
+	 $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c
+
+imachtest.o : imach.c 
+	 $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o imachtest.o -c imach.c
+
+#	 $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DFIXMNBRAK -o imachtest.o -c imach.c
 
 # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx
 imachcl: imach.c