*** empty log message ***

diff --git a/src/Makefile b/src/Makefile
index 7b1c559c07a8d7322296d4cbf320910caf21e836..2715d6d9bdc12c0e6b89713a9e24e26873575c6e 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=3
+IMACHSETUPVERSION=ilc64
 
 #       Linux
 # make _linux=1 imachopt
@@ -15,7 +15,8 @@ IMACHSETUPVERSION=3
 #  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) #binary should have been compiled on Windows with cl
+# make _windowsonosx=1 imachILC64-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
+# make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make imachMVC-noreg-setup
 #
 #        Windows cross-compiled mw64
@@ -35,7 +36,8 @@ IMACHSETUPVERSION=3
 # ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
 #TESTFILE=$$HOME/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
-TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
@@ -44,10 +46,10 @@ GCC= gcc
 
 ifdef _macosx
 # Mac OS/X version
-LFLAGS= -g -lm -DUNIX
-CFLAGS= -g -DUNIX -DOSX
-LFLAGSOPT= -O3 -lm -DUNIX
-CFLAGSOPT= -O3 -DUNIX
+LFLAGS= -g -lm 
+CFLAGS= -g -DDEBUG 
+LFLAGSOPT= -O3 -lm 
+CFLAGSOPT= -O3 
 UNIX2DOS= echo "Unix2dos " 
 DSYMUTIL= dsymutil
 STRIP= strip
@@ -233,6 +235,18 @@ imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
        cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
 
+imachILC64-setup: IMaCh-ilc64.exe setup.iss
+       touch setup.iss.in
+       $(CP) IMaCh-ilc64.exe imach.exe
+       $(SETUPCOMP) /cc setup.iss
+       $(CP) Output/$(TMPSETUPEXE) imachILC64-setup
+
+imachILC64-noreg-setup: IMaCh-ilc64.exe noreg-setup.iss
+       touch setup.iss.in
+       $(CP) IMaCh-ilc64.exe imach.exe
+       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+       $(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup
+
 imachMVC-setup: imachMVC.exe setup.iss
        touch setup.iss.in
        $(CP) imachMVC.exe imach.exe
@@ -258,7 +272,9 @@ ifdef _macosx
 endif
 
 imach.o : imach.c 
-       $(CC) $(CFLAGS) -DPOWELL -c imach.c
+       $(CC) $(CFLAGS) -c imach.c
+
+# $(CC) $(CFLAGS) -DPOWELL -c imach.c
 
 # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx
 imachcl: imach.c
@@ -299,7 +315,9 @@ ifdef _linux64onosx
 endif
 
 imachopt.o : imach.c 
-       $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
+       $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
+
+#      $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
 imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
        $(CC) $(LFLAGSOPT) -o imach imachopt.o