Summary: Trying gcc-4.8.0-mingw32

Author: Brouard

diff --git a/src/Makefile b/src/Makefile
index e53725367bf49f7696b527213ac28b91bdbbf98c..48f06e35a72b86048c473462f6a42bc918f2b509 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.98nT
+VERSION=0.98nV
 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=1
 
@@ -78,6 +78,7 @@ 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
 LFLAGS= -g
 CFLAGS= -g
 LFLAGSOPT= -O3
@@ -157,12 +158,14 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
 PARAM=mypar1
 
 imachcyg-setup: imachcygopt.exe setup.iss
+       touch setup.iss.in
        $(CP) imachcygopt.exe imach.exe
        $(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
+       touch setup.iss.in
        $(CP) imachcygopt.exe imach.exe
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
        cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
@@ -180,10 +183,6 @@ endif
 
 imach.o : imach.c 
        $(CC) $(CFLAGS) -DPOWELL -c imach.c
-imach-1.129cvsmac : imach-1.129cvsmac.o 
-       $(CC) $(LFLAGS) -o imach-1.129cvsmac imach-1.129cvsmac.o
-imach-1.129cvsmac.o : imach-1.129cvsmac.c 
-       $(CC) $(CFLAGS) -DPOWELL -c imach-1.129cvsmac.c
 
 imach097b : imach097b.o 
        $(CC) $(LFLAGS) -o imach097b imach097b.o
@@ -218,6 +217,7 @@ imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh
        mkdir -p imach$(VERSION).app/Contents/Resources
        mkdir -p imach$(VERSION).app/Contents/Resources/Scripts
        mkdir -p imach$(VERSION).app/Contents/Resources/bin
+       mkdir -p imach$(VERSION).app/Contents/Resources/html
        cp imach imach$(VERSION).app/Contents/Resources/bin
        cp gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot
        mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd
@@ -228,10 +228,18 @@ imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh
        cp -p IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns
        cp -r -p main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt
        cp IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc
+       cp ../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html
+       cp ../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html
+       cp ../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html
        rm -f imach$(VERSION).dmg
-       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
+       ./createdmg3.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
+       mv  imach$(VERSION).dmg Output/
 #      ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app
+#      ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
 
+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