--- imach/src/Makefile 2015/01/03 16:33:27 1.51 +++ imach/src/Makefile 2015/02/11 17:31:05 1.55 @@ -42,7 +42,8 @@ IMACHSETUPVERSION=mvc ##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/Biaspar/biaspar-wopowell.imach +#TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach +TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.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 @@ -55,6 +56,7 @@ LFLAGS= -g -lm CFLAGS= -g -DDEBUG LFLAGSOPT= -O3 -lm CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=0 UNIX2DOS= echo "Unix2dos " DSYMUTIL= dsymutil STRIP= strip @@ -90,6 +92,7 @@ LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -lm CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 CP= cp UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" @@ -105,6 +108,7 @@ LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -s CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac CP= cp @@ -118,6 +122,7 @@ LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -lm -s CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac CP= cp @@ -134,7 +139,10 @@ ifdef _intel64onosx GCC=/opt/intel/bin/icc CFLAGS= -m64 -g -std=c99 LFLAGS= -g -m64 +#CFLAGSOPT= -O3 -m64 -g -std=c99 -no-prec-div idem +#CFLAGSOPT= -O3 -m64 -g -std=c99 -xSSSE3_ATOM 402 CFLAGSOPT= -O3 -m64 -g -std=c99 +CROSSCOMPILATION= -DCROSS=0 IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh intel64; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv") include makeenv #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld @@ -152,6 +160,7 @@ GCC=/opt/intel/bin/icc CFLAGS= -m32 -g -std=c99 LFLAGS= -g -m32 CFLAGSOPT= -O3 -m32 -g -std=c99 +CROSSCOMPILATION= -DCROSS=0 IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh ia32; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv") include makeenv #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld @@ -187,6 +196,7 @@ LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -s -lm CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 TAR= /sw/bin/gnutar UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac @@ -204,6 +214,7 @@ INLOPT= -I/usr/local/include LNLOPT= -lm -L/usr/local/lib -lnlopt CFLAGSOPT= -O3 -g LFLAGSOPT= -O3 -g -lm +CROSSCOMPILATION= -DCROSS=0 UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" BINVERSION=LINUXnative @@ -293,7 +304,7 @@ imachILC64-noreg-setup: IMaCh-ilc64.exe $(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 @@ -330,7 +341,7 @@ ifdef _macosx endif imach.o : imach.c - $(CC) $(CFLAGS) -DPOWELL -c imach.c + $(CC) $(CFLAGS) $(CROSSCOMPILATION) -c imach.c # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx imachcl: imach.c