*** empty log message ***

diff --git a/src/Makefile b/src/Makefile
index e8f97b3d71172b929a7de0a7d9c3698b699a3f41..751baaa5e0df1cbe66934f72266962ba68c04439 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
 VERSION=0.98p
 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=ilc64
+#IMACHSETUPVERSION=ilc64
+IMACHSETUPVERSION=mvc
 
 #       Linux
 # make _linux=1 imachopt
@@ -21,7 +22,7 @@ IMACHSETUPVERSION=ilc64
 #        Windows
 # 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
+# make _windowsonosx=1 imachMVC-noreg-setup
 #
 #        Windows cross-compiled mw64
 # make _mw64onsox=1 imachcyg-setup
@@ -163,12 +164,14 @@ BINVERSION=osx-intel-ia32-bin
 endif
 
 ifdef _linux64onosx
-GCC=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc
-STRIP=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-strip
+GCC=/usr/localold/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc
+STRIP=/usr/localold/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-strip
 LFLAGS= -g
 CFLAGS= -g
+CROSSCOMPILATION= -DCROSS=1
 LFLAGSOPT= -O3 -lm -s
 CFLAGSOPT= -O3
+TAR= /sw/bin/gnutar
 UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp
@@ -178,12 +181,13 @@ endif
 ifdef _linux32onosx
 #GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc
 #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
+GCC=/usr/localold/gcc-4.8.1-for-linux32/bin/i586-pc-linux-gcc
+STRIP=/usr/localold/gcc-4.8.1-for-linux32/bin/i586-pc-linux-strip
 LFLAGS= -g
 CFLAGS= -g
 LFLAGSOPT= -O3 -s -lm
 CFLAGSOPT= -O3
+TAR= /sw/bin/gnutar
 UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp
@@ -278,7 +282,7 @@ imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss
        cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
 
 imachILC64-setup: IMaCh-ilc64.exe setup.iss
-       touch setup.iss.in
+       pwd
        $(CP) IMaCh-ilc64.exe imach.exe
        $(SETUPCOMP) /cc setup.iss
        $(CP) Output/$(TMPSETUPEXE) imachILC64-setup
@@ -289,6 +293,18 @@ imachILC64-noreg-setup: IMaCh-ilc64.exe noreg-setup.iss
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
        $(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup
 
+imachILC32-setup: IMaCh-ilc32.exe setup.iss
+       touch setup.iss.in
+       $(CP) IMaCh-ilc32.exe imach.exe
+       $(SETUPCOMP) /cc setup.iss
+       $(CP) Output/$(TMPSETUPEXE) imachILC32-setup
+
+imachILC32-noreg-setup: IMaCh-ilc32.exe noreg-setup.iss
+       touch setup.iss.in
+       $(CP) IMaCh-ilc32.exe imach.exe
+       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+       $(CP) Output/$(TMPSETUPEXE) imachILC32-noreg-setup
+
 imachMVC-setup: imachMVC.exe setup.iss
        touch setup.iss.in
        $(CP) imachMVC.exe imach.exe
@@ -359,14 +375,14 @@ ifdef _macosx
        $(STRIP) imach
 endif
 ifdef _linux32onosx
-       (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
+       (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif
 ifdef _linux64onosx
-       (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
+       (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif
 
 imachopt.o : imach.c
-       $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
+       $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
 #      $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
 imachUB : imach32 imach64

diff --git a/src/imach.c b/src/imach.c
index 5f2b2476af1f160275b1d0a36a2824d3b18629b3..2bdc0f966059b2c7c570b3883a3588bf7df60402 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.174  2015/01/03 16:15:49  brouard
+  Summary: Still in cross-compilation
+
   Revision 1.173  2015/01/03 12:06:26  brouard
   Summary: trying to detect cross-compilation
 
@@ -5503,6 +5506,11 @@ void syscompilerinfo()
 #endif
 
 #include <stdint.h>
+   int cross = CROSS;
+   if (cross){
+     printf("Cross-");
+     fprintf(ficlog,"Cross-");
+   }
    printf("Compiled with:");fprintf(ficlog,"Compiled with:");
 #if defined(__clang__)
    printf(" Clang/LLVM");fprintf(ficlog," Clang/LLVM");        /* Clang/LLVM. ---------------------------------------------- */