--- imach/src/Makefile	2005/05/04 17:17:45	1.11
+++ imach/src/Makefile	2005/10/17 15:30:26	1.14
@@ -1,17 +1,25 @@
 #CC= gcc -v
 CC= gcc
 
-LFLAGS= -g -lm
-CFLAGS= -g 
-
-#LFLAGS= -O3 -lm
-#CFLAGS= -O3 
+# Mac OS/X version
+LFLAGS= -O3 -lm -DUNIX
+CFLAGS= -O3 -DUNIX
+UNIX2DOS= echo "Unix2dos " 
 
+# Windows cygwin version
 #LFLAGS= -g -mno-cygwin
 #CFLAGS= -g
 
 #LFLAGS= -O3 -mno-cygwin
 #CFLAGS= -O3 -mno-cygwin
+#LFLAGS= -g -lm
+#CFLAGS= -g 
+#UNIX2DOS= unix2dos
+
+# Linux version
+#LFLAGS= -O3 -lm
+#CFLAGS= -O3 
+#UNIX2DOS= unix2dos
 
 SED= sed
 PACKAGE=imach
@@ -25,12 +33,20 @@ PROGRAM=IMaCh
 ##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe"
 
 #SETUPCOMP= echo 
-SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
-#SETUPCOMP= Compil32 
+# Linux
+#SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
+##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
+#Windows cygwin
+# make imachcyg
+# make imach-setupe.exe
+# sortie dans Outpu/setup.exe
+# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 3/Compil32.exe /usr/local/bin/Compil32
+##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
+SETUPCOMP= Compil32 
 TMPSETUPSCRIPT=setup.iss
 TMPSCRIPTIN=setup.iss.in
 APPNAME=IMaCh
-VERSION=0.97b
+VERSION=0.98
 GNUPLOTVERSION=4.0
 IMACHSETUPVERSION=2
 LICENSE=Copying
@@ -40,7 +56,7 @@ TMPSETUPEXE=imach-setup.exe
 LICENSEFILE=$(LICENSE)
 INFOBEFOREFILE=Readme.txt
 
-$(TMPSETUPSCRIPT):
+$(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
@@ -51,8 +67,9 @@ $(TMPSETUPSCRIPT):
 	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
 		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
 		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
+	$(UNIX2DOS) $(TMPSETUPSCRIPT)
 
-$(TMPSETUPEXE):
+$(TMPSETUPEXE): $(TMPSETUPSCRIPT)
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
 
 PARAM=mypar1
@@ -62,7 +79,7 @@ imach : imach.o
 imach.o : imach.c 
 	$(CC) $(CFLAGS) -c imach.c
 
-imachcyg : imachcyg.o  $(TMPSETUPSCRIPT) $(TMPSETUPEXE) 
+imachcyg : imachcyg.o  $(TMPSETUPSCRIPT) 
 	$(CC) -mno-cygwin -o imach imachcyg.o
 imachcyg.o : imach.c 
 	$(CC) -mno-cygwin -c -o imachcyg.o imach.c