Summary: Merging

diff --git a/src/Makefile b/src/Makefile
index c68bd0bf2abbf743b22ea6422e3b613c21ab9d26..9c20efcf8292df0dbc7ffb8985ccac856ae91bcd 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,9 +2,6 @@ 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
 
@@ -15,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"
@@ -25,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
@@ -63,6 +69,18 @@ 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
@@ -89,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; \
@@ -105,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; \
@@ -133,12 +152,14 @@ PARAM=mypar1
 
 imachcyg-setup: imachcygopt.exe setup.iss
        $(CP) imachcygopt.exe imach.exe
-       $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
+       $(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
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+       cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
 
 simach : simach.o 
        $(CC) $(LFLAGS) $(LGSL) -o simach simach.o