--- imach/src/Makefile	2014/09/16 11:01:02	1.46
+++ imach/src/Makefile	2015/01/03 16:16:07	1.50
@@ -1,4 +1,4 @@
-VERSION=0.98nX
+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)
 IMACHSETUPVERSION=ilc64
 
@@ -10,7 +10,11 @@ IMACHSETUPVERSION=ilc64
 # make _linux64onosx=1 imachopt
 
 #       OS/X
+# make _intel64onosx=1 imachopt
+# make _intel32onosx=1 imachopt
+# make _intelUNBonosx=1 imachdmg # Not implemented (not useful)
 # make _macosx=1 imach
+# make _macosx=1 imachopt
 # make _macosx=1 imachdmg
 #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach
 
@@ -123,6 +127,41 @@ ifdef _windowscl
 rem "C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvas32.bat"
 endif
 
+# make _intel64onosx=1 imachopt
+#source /opt/intel/bin/iccvars.sh intel64
+ifdef _intel64onosx
+GCC=/opt/intel/bin/icc
+CFLAGS= -m64 -g -std=c99
+LFLAGS= -g -m64
+CFLAGSOPT= -O3 -m64 -g -std=c99
+IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh intel64; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")
+include makeenv
+#lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld
+LFLAGSOPT= -O3 -m64
+UNIX2DOS= unix2dos
+SETUPCOMP= ~/bin/InnoSetup5Playonmac
+CP= cp
+BINVERSION=osx-intel-x86-64-bin
+#imach_64$(VERSION)
+#
+endif
+
+ifdef _intel32onosx
+GCC=/opt/intel/bin/icc
+CFLAGS= -m32 -g -std=c99
+LFLAGS= -g -m32
+CFLAGSOPT= -O3 -m32 -g -std=c99
+IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh ia32; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")
+include makeenv
+#lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld
+#lipo -create -arch i386 imach_32$(VERSION) -arch x86_64 imach_64$(VERSION) -output imach$(VERSION)
+LFLAGSOPT= -O3 -m32
+UNIX2DOS= unix2dos
+SETUPCOMP= ~/bin/InnoSetup5Playonmac
+CP= cp
+BINVERSION=osx-intel-ia32-bin
+endif
+
 ifdef _linux64onosx
 GCC=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc
 STRIP=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-strip
@@ -153,17 +192,18 @@ 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
 INLOPT= -I/usr/local/include
 LNLOPT= -lm -L/usr/local/lib -lnlopt
-CFLAGSOPT= -O3 -DUNIX -DLINUX
-LFLAGSOPT= -O3 -lm -s
+CFLAGSOPT= -O3 -g
+LFLAGSOPT= -O3 -g -lm
 UNIX2DOS= unix2dos
 SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 BINVERSION=LINUXnative
+CP= cp
 endif
 
 SED= sed
@@ -274,9 +314,7 @@ ifdef _macosx
 endif
 
 imach.o : imach.c 
-	$(CC) $(CFLAGS) -c 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
@@ -298,34 +336,44 @@ imachgsl : imachgsl.o
 imachgsl.o : imach.c 
 	$(CC) $(CFLAGS) -DGSL $(IGSL) -c imach.c
 
-imachnlopt : imachnlopt.o 
-	$(CC) -o imachnlopt imach.o  $(LFLAGS) $(LNLOPT) 
-imachnlopt.o : imach.c 
-	$(CC) $(CFLAGS) -DNLOPT $(INLOPT) -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
+	$(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
+	$(CP) -f imach ../bin
+ifdef _intel64onosx
+	$(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
+endif
 ifdef _macosx
 	$(STRIP) imach
-	cp imach ../bin
 endif
 ifdef _linux32onosx
-	$(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
-	cp -f imach ../bin
 	(cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif
 ifdef _linux64onosx
-	$(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
-	cp -f imach ../bin
 	(cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif
 
-imachopt.o : imach.c 
+imachopt.o : imach.c
 	$(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
-
 #	$(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
+imachUB : imach32 imach64
+	lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)
+
+
+#imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
 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
 	#hdiutil detach /Volumes/IMaCh\ $(VERSION)