Summary:Adding test with ming-64 for Windows

Author: Brouard

diff --git a/src/Makefile b/src/Makefile
index 25a8f0a538e5a67c0da2537b8074311cf48ba17d..7b1c559c07a8d7322296d4cbf320910caf21e836 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 VERSION=0.98nX
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)
-IMACHSETUPVERSION=2
+IMACHSETUPVERSION=3
 
 #       Linux
 # make _linux=1 imachopt
@@ -15,9 +15,12 @@ IMACHSETUPVERSION=2
 #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach
 
 #        Windows
-# make imachMVC-setup (touch setup.iss.in)
+# make imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make imachMVC-noreg-setup
 #
+#        Windows cross-compiled mw64
+# make _mw64onsox=1 imachcyg-setup
+#
 # make _windows=1 imachcyg
 # make _windows=1 imachcyg-setup (touch setup.iss.in)
 # make _windows=1 imachcyg-noreg-setup
@@ -88,7 +91,6 @@ 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
 GCC=/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-gcc-4.8.0
 STRIP=/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-strip
@@ -102,6 +104,19 @@ CP= cp
 BINVERSION=WIN32onOSX
 endif
 
+ifdef _mw64onosx
+GCC=/usr/local/mingw-w64-bin_i686-darwin_20130622/bin/x86_64-w64-mingw32-gcc-4.9.0
+STRIP=/usr/local/mingw-w64-bin_i686-darwin_20130622/bin/x86_64-w64-mingw32-strip
+LFLAGS= -g
+CFLAGS= -g
+LFLAGSOPT= -O3 -lm -s
+CFLAGSOPT= -O3
+UNIX2DOS= unix2dos
+SETUPCOMP= ~/bin/InnoSetup5Playonmac
+CP= cp
+BINVERSION=w64-mingw32-x86-64-bin
+endif
+
 ifdef _windowscl
 rem "C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvas32.bat"
 endif
@@ -121,7 +136,6 @@ endif
 
 ifdef _linux32onosx
 #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
 GCC=/usr/local/gcc-4.8.1-for-linux32/bin/i586-pc-linux-gcc
 STRIP=/usr/local/gcc-4.8.1-for-linux32/bin/i586-pc-linux-strip
@@ -322,16 +336,14 @@ upload:
        ls Output/* | xargs md5sum
        rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/
 
-imachcyg : imachcyg.o  strsep.o
-       $(CC) $(LFLAGS) -o imach imachcyg.o strsep.o
+imachcyg : imachcyg.o
+       $(CC) $(LFLAGS) -o imach imachcyg.o
 imachcyg.o : imach.c 
        $(CC) $(CFLAGS)  -c -o imachcyg.o imach.c
-imachcygopt.exe : imachcygopt.o  strsep.o
-       $(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o strsep.o
+imachcygopt.exe : imachcygopt.o
+       $(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o
 imachcygopt.o : imach.c 
        $(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c
-strsep.o : strsep.c 
-       $(CC) $(CFLAGSOPT) -c -o strsep.o strsep.c
 
 imachw32.o : imach.c
        i386-mingw32-gcc -c imach.c -o imachw32.o