--- imach/src/Makefile	2009/07/06 10:22:06	1.27
+++ imach/src/Makefile	2009/10/29 13:19:55	1.29
@@ -1,4 +1,4 @@
-VERSION=0.98k
+VERSION=0.98l
 COPYRIGHT=Copyright (C)  2002-2009 INED-EUROREVES-Institut de longévité
 IMACHSETUPVERSION=1
 
@@ -17,7 +17,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
@@ -33,15 +34,28 @@ UNIX2DOS= echo "Unix2dos "
 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 
+#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
+CFLAGSOPT= -O3
+UNIX2DOS= unix2dos
+SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 endif
 
 ifdef _linux
@@ -86,7 +100,6 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
 		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
 		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
-	$(UNIX2DOS) $(TMPSETUPSCRIPT)
 
 $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
@@ -102,7 +115,7 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
 		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
 		$(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)
-	$(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
+#	$(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
 
 $(TMPSETUPEXE): $(TMPSETUPSCRIPT)
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
@@ -113,7 +126,7 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRI
 PARAM=mypar1
 
 imachcyg-setup: imachcygopt.exe setup.iss
-	cp imachcygopt.exe imach.exe
+	copy imachcygopt.exe imach.exe
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
 
 # imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)