From: N. Brouard Date: Sun, 4 Jan 2015 09:35:48 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: imach-099s7~383 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=87bb1e1891dac8238c542830ba7137b25d82cae1;p=.git *** empty log message *** --- diff --git a/src/Makefile b/src/Makefile index 1e24d6c..41ad1b8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -297,7 +297,7 @@ 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 +imachILC32-setup: IMaCh-ilc32-XP.exe setup.iss touch setup.iss.in $(CP) IMaCh-ilc32.exe imach.exe $(SETUPCOMP) /cc setup.iss diff --git a/src/imach.c b/src/imach.c index 2919906..39134e3 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1,6 +1,9 @@ /* $Id$ $State$ $Log$ + Revision 1.177 2015/01/03 18:40:56 brouard + Summary: Still testing ilc32 on OSX + Revision 1.176 2015/01/03 16:45:04 brouard *** empty log message *** @@ -5510,18 +5513,21 @@ void syscompilerinfo() /* #include "syscompilerinfo.h"*/ #if defined __INTEL_COMPILER - struct utsname sysInfo; +#if defined(__GNUC__) + struct utsname sysInfo; /* For Intel on Linux and OS/X */ +#endif #elif defined(__GNUC__) #include /* Only on gnu */ struct utsname sysInfo; -#endif - -#include int cross = CROSS; if (cross){ - printf("Cross-"); - fprintf(ficlog,"Cross-"); + printf("Cross-"); + fprintf(ficlog, "Cross-"); } +#endif + +#include + printf("Compiled with:");fprintf(ficlog,"Compiled with:"); #if defined(__clang__) printf(" Clang/LLVM");fprintf(ficlog," Clang/LLVM"); /* Clang/LLVM. ---------------------------------------------- */ @@ -5615,7 +5621,7 @@ void syscompilerinfo() } else{ printf("The process is not running under WOW64 (i.e probably on a 64bit Windows).\n"); - frintf(ficlog,"The programm is not running under WOW64 (i.e probably on a 64bit Windows).\n"); + fprintf(ficlog,"The programm is not running under WOW64 (i.e probably on a 64bit Windows).\n"); } // printf("\nPress Enter to continue..."); // getchar();