--- imach/src/Makefile	2009/10/29 13:19:55	1.29
+++ imach/src/Makefile	2011/09/02 10:28:58	1.31
@@ -1,5 +1,5 @@
-VERSION=0.98l
-COPYRIGHT=Copyright (C)  2002-2009 INED-EUROREVES-Institut de longévité
+VERSION=0.98m
+COPYRIGHT=Copyright (C)  2002-2010 INED-EUROREVES-Institut de longevite
 IMACHSETUPVERSION=1
 
 # make _linux=1 imachopt
@@ -12,6 +12,13 @@ IMACHSETUPVERSION=1
 # make _windows=1 imachcyg
 # make _windows=1 imachcyg-setup (touch setup.iss.in)
 # make _windows=1 imachcyg-noreg-setup
+#
+# make _windowsonlinux=1 imachcyg-setup (touch setup.iss.in)
+# make _windowsonlinux=1 imachcyg-noreg-setup
+#
+# make _windowsonosx=1 imachcyg-setup (touch setup.iss.in)
+# make _windowsonosx=1 imachcyg-noreg-setup
+#
 # sortie dans Output/setup.exe
 # ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
@@ -22,8 +29,10 @@ GCC= gcc
 
 ifdef _macosx
 # Mac OS/X version
-LFLAGS= -O3 -lm -DUNIX
-CFLAGS= -O3 -DUNIX
+LFLAGS= -g -lm -DUNIX
+CFLAGS= -g -DUNIX
+LFLAGSOPT= -O3 -lm -DUNIX
+CFLAGSOPT= -O3 -DUNIX
 UNIX2DOS= echo "Unix2dos " 
 # Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg
 # ./createdmg.sh imach imach098panther ./imach098Panther
@@ -42,6 +51,7 @@ CFLAGS= -g -mno-cygwin
 LFLAGSOPT= -O3 -mno-cygwin
 CFLAGSOPT= -O3 -mno-cygwin
 UNIX2DOS= unix2dos
+CP= copy
 #SETUPCOMP= Compil32 
 ##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe"
 # cygwin SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
@@ -52,16 +62,30 @@ ifdef _windowsonlinux
 GCC=/usr/bin/i586-pc-mingw32-gcc
 LFLAGS= -g
 CFLAGS= -g
-LFLAGSOPT= -O3
+LFLAGSOPT= -O3 -lm
 CFLAGSOPT= -O3
+CP= cp
 UNIX2DOS= unix2dos
 SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 endif
 
+ifdef _windowsonosx
+GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc
+# w64 outputs bigger executables
+#GCC=/usr/local/cross-tools/bin/i686-w64-mingw32-gcc
+LFLAGS= -g
+CFLAGS= -g
+LFLAGSOPT= -O3
+CFLAGSOPT= -O3
+UNIX2DOS= unix2dos
+SETUPCOMP= ~/bin/InnoSetup5Playonmac
+endif
+
 ifdef _linux
 #CFLAGS= -g -DUNIX -DDEBUGHESS
 CFLAGS= -g -DUNIX
 LFLAGS= -g -lm 
+IGSL= -I/usr/include/gsl
 LGSL= -lgsl -lgslcblas
 CFLAGSOPT= -O3 -DUNIX
 LFLAGSOPT= -O3 -lm
@@ -83,10 +107,11 @@ APPNAME=$(APPLICATION)-$(VERSION)
 GNUPLOTVERSION=4.0
 LICENSE=Copying
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
+TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe
 LICENSEFILE=$(LICENSE)
 INFOBEFOREFILE=README.txt
 
-$(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
+setup.iss: setup.iss.in
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
 		s/@NOTINNOREG@//g; \
 		s/@NOREG@//g; \
@@ -99,7 +124,7 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 		s/@DICTLANG@/$(DICTLANG)/g; \
 	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
 		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
-		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
+		setup.iss.in > setup.iss
 
 $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
@@ -126,29 +151,42 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRI
 PARAM=mypar1
 
 imachcyg-setup: imachcygopt.exe setup.iss
-	copy imachcygopt.exe imach.exe
-	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
+	$(CP) imachcygopt.exe imach.exe
+	$(SETUPCOMP) /cc setup.iss
+	cp Output/$(TMPSETUPEXE) imachcyg-setup
 
 # imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)
 imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss
-	cp imachcygopt.exe imach.exe
+	$(CP) imachcygopt.exe imach.exe
 	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+	cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
 
 simach : simach.o 
 	$(CC) $(LFLAGS) $(LGSL) -o simach simach.o
 simach.o : simach.c 
-	$(CC) $(CFLAGS) -c simach.c
+	$(CC) $(CFLAGS) -DGSL -c simach.c
 
 imach : imach.o 
 	$(CC) $(LFLAGS) -o imach imach.o
 imach.o : imach.c 
-	$(CC) $(CFLAGS) -c imach.c
+	$(CC) $(CFLAGS) -DPOWELL -c imach.c
+
+
+imachsimplified : imachsimplified.o 
+	$(CC)  $(LFLAGSOPT) -o imachsimplified imachsimplified.o
+imachsimplified.o : imachsimplified.c 
+	$(CC) $(CFLAGSOPT) -DPOWELL -c imachsimplified.c
+
+imachgsl : imachgsl.o 
+	$(CC) $(LFLAGS) $(LGSL) -o imachgsl imach.o
+imachgsl.o : imach.c 
+	$(CC) $(CFLAGS) -DGSL $(IGSL) -c imach.c
 
 imachopt : imachopt.o 
 	$(CC) $(LFLAGSOPT) -o imachopt imachopt.o
 	ln -f imachopt imach
 imachopt.o : imach.c 
-	$(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
+	$(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
 imachdmg : imachopt.o create-dmg
 	$(CC) $(LFLAGSOPT) -o imach imachopt.o