--- imach/src/Makefile	2014/09/02 09:24:48	1.44
+++ imach/src/Makefile	2014/09/25 11:42:54	1.47
@@ -1,6 +1,6 @@
-VERSION=0.98nX
+VERSION=0.99
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)
-IMACHSETUPVERSION=3
+IMACHSETUPVERSION=ilc64
 
 #       Linux
 # make _linux=1 imachopt
@@ -15,7 +15,8 @@ IMACHSETUPVERSION=3
 #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach
 
 #        Windows
-# make imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
+# make _windowsonosx=1 imachILC64-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
+# make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make imachMVC-noreg-setup
 #
 #        Windows cross-compiled mw64
@@ -35,7 +36,8 @@ IMACHSETUPVERSION=3
 # ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
 ##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/carol/carol-june2014/educadlmwt24.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.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
@@ -44,10 +46,10 @@ GCC= gcc
 
 ifdef _macosx
 # Mac OS/X version
-LFLAGS= -g -lm -DUNIX
-CFLAGS= -g -DUNIX -DOSX
-LFLAGSOPT= -O3 -lm -DUNIX
-CFLAGSOPT= -O3 -DUNIX
+LFLAGS= -g -lm 
+CFLAGS= -g -DDEBUG 
+LFLAGSOPT= -O3 -lm 
+CFLAGSOPT= -O3 
 UNIX2DOS= echo "Unix2dos " 
 DSYMUTIL= dsymutil
 STRIP= strip
@@ -151,12 +153,14 @@ endif
 
 ifdef _linux
 #CFLAGS= -g -DUNIX -DDEBUGHESS
-CFLAGS= -g -DUNIX -DLINUX
+CFLAGS= -g -DDEBUG
 LFLAGS= -g -lm
 IGSL= -I/usr/include/gsl
 LGSL= -lgsl -lgslcblas
-CFLAGSOPT= -O3 -DUNIX -DLINUX
-LFLAGSOPT= -O3 -lm -s
+INLOPT= -I/usr/local/include
+LNLOPT= -lm -L/usr/local/lib -lnlopt
+CFLAGSOPT= -O3 -g
+LFLAGSOPT= -O3 -g -lm
 UNIX2DOS= unix2dos
 SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 BINVERSION=LINUXnative
@@ -233,6 +237,18 @@ imachcyg-noreg-setup: imachcygopt.exe no
 	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
 	cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
 
+imachILC64-setup: IMaCh-ilc64.exe setup.iss
+	touch setup.iss.in
+	$(CP) IMaCh-ilc64.exe imach.exe
+	$(SETUPCOMP) /cc setup.iss
+	$(CP) Output/$(TMPSETUPEXE) imachILC64-setup
+
+imachILC64-noreg-setup: IMaCh-ilc64.exe noreg-setup.iss
+	touch setup.iss.in
+	$(CP) IMaCh-ilc64.exe imach.exe
+	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+	$(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup
+
 imachMVC-setup: imachMVC.exe setup.iss
 	touch setup.iss.in
 	$(CP) imachMVC.exe imach.exe
@@ -258,7 +274,7 @@ ifdef _macosx
 endif
 
 imach.o : imach.c 
-	$(CC) $(CFLAGS) -DPOWELL -c imach.c
+	 $(CC) $(CFLAGS) -DPOWELL -c imach.c
 
 # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx
 imachcl: imach.c
@@ -276,10 +292,21 @@ imachsimplified.o : imachsimplified.c
 	$(CC) $(CFLAGSOPT) -DPOWELL -c imachsimplified.c
 
 imachgsl : imachgsl.o 
-	$(CC) $(LFLAGS) $(LGSL) -o imachgsl imach.o
+	$(CC) -o imachgsl imach.o  $(LFLAGS) $(LGSL) 
 imachgsl.o : imach.c 
 	$(CC) $(CFLAGS) -DGSL $(IGSL) -c imach.c
 
+imachNEWUOAopt : imachNEWUOAopt.o 
+	$(CC) -o imachNEWUOAopt  imachNEWUOAopt.o  $(LFLAGS) -g $(LNLOPT) 
+imachNEWUOAopt.o : imach.c 
+	$(CC) $(CFLAGS) -g -DNLOPT $(INLOPT) -DNEWUOA -o  imachNEWUOAopt.o -c imach.c
+
+imachBOBYQAopt : imachBOBYQAopt.o 
+	$(CC) -o imachBOBYQAopt imachBOBYQAopt.o  $(LFLAGS) $(LNLOPT) 
+imachBOBYQAopt.o : imach.c 
+	$(CC) $(CFLAGS) -DNLOPT $(INLOPT) -DBOBYQA -o imachBOBYQAopt.o -c imach.c
+
+
 imachopt : imachopt.o 
 	$(CC) $(LFLAGSOPT) -o imachopt imachopt.o
 	ln -f imachopt imach
@@ -299,7 +326,9 @@ ifdef _linux64onosx
 endif
 
 imachopt.o : imach.c 
-	$(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
+	$(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
+
+#	$(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
 imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
 	$(CC) $(LFLAGSOPT) -o imach imachopt.o