Changes for compiling on Windows with Mingw and not only cygwin.

diff --git a/src/Makefile b/src/Makefile
index ff8b0038d4893d4eceebaea9da04d553aa22967b..8195a9df02935da8e21e47c838e8c27cf2d6d073 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.98k
+VERSION=0.98l
 COPYRIGHT=Copyright (C)  2002-2009 INED-EUROREVES-Institut de longévité
 IMACHSETUPVERSION=1
 
@@ -34,15 +34,18 @@ 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
@@ -97,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; \
@@ -113,7 +115,7 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
                s/@VERMAJOR@/$(VERMAJOR)/g; \
                s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
                $(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)
-       $(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
+#      $(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
 
 $(TMPSETUPEXE): $(TMPSETUPSCRIPT)
        $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
@@ -124,7 +126,7 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
 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)