*** empty log message ***

diff --git a/src/Makefile b/src/Makefile
index e778771302581fd7fb4ecb2114a9ffe1922ed104..460b54a2aee9b1622e87031a6bb30bca9e4551f9 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 VERSION=0.98q0
-COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121, Intel Software 2015)
-#IMACHSETUPVERSION=ilc64
-IMACHSETUPVERSION=mvc
+COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
+IMACHSETUPVERSION=ilc
+#IMACHSETUPVERSION=mvc
 
 #       Linux
 # make _linux=1 imachopt
@@ -20,7 +20,8 @@ IMACHSETUPVERSION=mvc
 #  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 _windowsonosx=1 imachILC64-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
+# make _windowsonosx=1 imachILC-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
+# make _windowsonosx=1 imachILC64-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
 # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make _windowsonosx=1 imachMVC-noreg-setup
 #
@@ -232,7 +233,8 @@ TMPNOREGSETUPSCRIPT=noreg-setup.iss
 TMPSCRIPTIN=setup.iss.in
 APPLICATION=IMaCh
 APPNAME=$(APPLICATION)-$(VERSION)
-GNUPLOTVERSION=4.0
+APPCOMPILATIONMODE=$(IMACHSETUPVERSION)
+GNUPLOTVERSION=4.6
 LICENSE=Copying
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe
@@ -244,6 +246,7 @@ setup.iss: setup.iss.in
                s/@NOTINNOREG@//g; \
                s/@NOREG@//g; \
                s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
+               s/@APPCOMPILATIONMODE@/$(APPCOMPILATIONMODE)/g; \
                s/@VERSION@/$(VERSION)/g; \
                s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
                s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
@@ -293,21 +296,27 @@ imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
        cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
 
-imachILC64-setup: IMaCh-ilc64.exe setup.iss
+# both 32 and 64 executables should have been built on Windows with Intel compiler.
+imachILC-setup: IMaCh-ilc64-$(VERSION).exe IMaCh-ilc32-$(VERSION).exe setup.iss
        pwd
-       $(CP) IMaCh-ilc64.exe imach.exe
+       $(SETUPCOMP) /cc setup.iss
+       $(CP) Output/$(TMPSETUPEXE) imachILC-setup
+
+imachILC64-setup: IMaCh-ilc64-$(VERSION).exe setup.iss
+       pwd
+       $(CP) IMaCh-ilc64-$(VERSION).exe imach.exe
        $(SETUPCOMP) /cc setup.iss
        $(CP) Output/$(TMPSETUPEXE) imachILC64-setup
 
-imachILC64-noreg-setup: IMaCh-ilc64.exe noreg-setup.iss
+imachILC64-noreg-setup: IMaCh-ilc64-$(VERSION).exe noreg-setup.iss
        touch setup.iss.in
-       $(CP) IMaCh-ilc64.exe imach.exe
+       $(CP) IMaCh-ilc64-$(VERSION).exe imach.exe
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
        $(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup
 
-imachILC32-setup: IMaCh-ilc32-XP.exe setup.iss
+imachILC32-setup: IMaCh-ilc32-$(VERSION).exe setup.iss
        touch setup.iss.in
-       $(CP) IMaCh-ilc32.exe imach.exe
+       $(CP) IMaCh-ilc32-$(VERSION).exe imach.exe
        $(SETUPCOMP) /cc setup.iss
        $(CP) Output/$(TMPSETUPEXE) imachILC32-setup