--- imach/src/Makefile	2006/03/16 15:51:15	1.23
+++ imach/src/Makefile	2010/04/30 09:00:45	1.30
@@ -1,11 +1,15 @@
-VERSION=0.98f
-COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
+VERSION=0.98m
+COPYRIGHT=Copyright (C)  2002-2010 INED-EUROREVES-Institut de longevite
 IMACHSETUPVERSION=1
 
+# make _windowsonlinux=1 imachcygopt.exe
+# make _windowsonlinux=1 imachcyg-setup (touch setup.iss.in)
+
 # make _linux=1 imachopt
 # make _linux=1 imach
 
-# make _macosx=1
+# make _macosx=1 imach
+# make _macosx=1 imachdmg
 
 #        Windows
 # make _windows=1 imachcyg
@@ -16,7 +20,8 @@ IMACHSETUPVERSION=1
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
 
 #CC= gcc -v
-CC= gcc
+CC=$(GCC)
+GCC= gcc
 
 ifdef _macosx
 # Mac OS/X version
@@ -25,24 +30,45 @@ CFLAGS= -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
+# ./createdmg.sh imach imach098leopard ./imach098Leopard
 # and directory ./imach098Panther contains package file imach098Panther.pkg
+#./create-dmg --window-size 500 300 --background ~/Projects/eclipse-osx-repackager/build/background.gif --icon-size 96 --volname "Hyper Foo" --icon "Applications" 380 205 --icon "Eclipse OS X Repackager" 110 205 test2.dmg /Users/andreyvit/Projects/eclipse-osx-repackager/temp/Eclipse\ OS\ X\ Repackager\ r10/
+# ./create-dmg --volname "IMaCh 0.98j" imach098j.dmg imach098Leopard
 endif
 
 ifdef _windows
+CC=c:\MinGW\bin\Mingw32-gcc
+
 # Windows cygwin version
 LFLAGS= -g -mno-cygwin
 CFLAGS= -g -mno-cygwin
 LFLAGSOPT= -O3 -mno-cygwin
 CFLAGSOPT= -O3 -mno-cygwin
 UNIX2DOS= unix2dos
-SETUPCOMP= Compil32 
+CP= copy
+#SETUPCOMP= Compil32 
 ##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe"
-##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
+# cygwin SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
+SETUPCOMP= "C:////Program Files////Inno Setup 4////Compil32.exe"
+endif
+
+ifdef _windowsonlinux
+GCC=/usr/bin/i586-pc-mingw32-gcc
+LFLAGS= -g
+CFLAGS= -g
+LFLAGSOPT= -O3 -lm
+CFLAGSOPT= -O3
+CP= cp
+UNIX2DOS= unix2dos
+SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 endif
 
 ifdef _linux
+#CFLAGS= -g -DUNIX -DDEBUGHESS
 CFLAGS= -g -DUNIX
-LFLAGS= -g -lm
+LFLAGS= -g -lm 
+IGSL= -I/usr/include/gsl
+LGSL= -lgsl -lgslcblas
 CFLAGSOPT= -O3 -DUNIX
 LFLAGSOPT= -O3 -lm
 UNIX2DOS= unix2dos
@@ -80,7 +106,6 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
 		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
 		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
-	$(UNIX2DOS) $(TMPSETUPSCRIPT)
 
 $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
@@ -96,7 +121,7 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
 		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
 		$(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)
-	$(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
+#	$(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
 
 $(TMPSETUPEXE): $(TMPSETUPSCRIPT)
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
@@ -107,24 +132,46 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRI
 PARAM=mypar1
 
 imachcyg-setup: imachcygopt.exe setup.iss
-	cp imachcygopt.exe imach.exe
+	$(CP) imachcygopt.exe imach.exe
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
 
 # 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)
 
+simach : simach.o 
+	$(CC) $(LFLAGS) $(LGSL) -o simach simach.o
+simach.o : 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
+	cp imach imach098Leopard/bin
+	./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach098Leopard
+
 
 imachcyg : imachcyg.o  strsep.o
 	$(CC) $(LFLAGS) -o imach imachcyg.o strsep.o