--- imach/src/Makefile 2014/08/27 19:06:49 1.40 +++ imach/src/Makefile 2015/01/04 09:35:04 1.53 @@ -1,6 +1,7 @@ -VERSION=0.98nX +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=1 +#IMACHSETUPVERSION=ilc64 +IMACHSETUPVERSION=mvc # Linux # make _linux=1 imachopt @@ -9,12 +10,23 @@ IMACHSETUPVERSION=1 # make _linux32onosx=1 imachopt # make _linux64onosx=1 imachopt - +# OS/X +# make _intel64onosx=1 imachopt +# make _intel32onosx=1 imachopt +# make _intelUNBonosx=1 imachdmg # Not implemented (not useful) # make _macosx=1 imach +# make _macosx=1 imachopt # make _macosx=1 imachdmg # 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 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl +# make _windowsonosx=1 imachMVC-noreg-setup +# +# Windows cross-compiled mw64 +# make _mw64onsox=1 imachcyg-setup +# # make _windows=1 imachcyg # make _windows=1 imachcyg-setup (touch setup.iss.in) # make _windows=1 imachcyg-noreg-setup @@ -22,13 +34,15 @@ IMACHSETUPVERSION=1 # make _windowsonlinux=1 imachcyg-setup (touch setup.iss.in) # make _windowsonlinux=1 imachcyg-noreg-setup # +# make _windowscl=1 imachclopt # # sortie dans Output/setup.exe # 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 @@ -37,12 +51,14 @@ 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 +BINVERSION=OSX # Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg # ./createdmg.sh imach imach098panther ./imach098Panther # ./createdmg.sh imach imach098leopard ./imach098Leopard @@ -61,6 +77,7 @@ LFLAGSOPT= -O3 -mno-cygwin CFLAGSOPT= -O3 -mno-cygwin UNIX2DOS= unix2dos CP= copy +BINVERSION=CYGWIN #SETUPCOMP= Compil32 ##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe" # cygwin SETUPCOMP= "C:\Program Files\Inno Setup 4\Compil32.exe" @@ -76,11 +93,11 @@ CFLAGSOPT= -O3 CP= cp UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" +BINVERSION=WINDOWSonLINUX endif ifdef _windowsonosx #GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc -# w64 outputs bigger executables #GCC=/usr/local/cross-tools/bin/i686-w64-mingw32-gcc GCC=/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-gcc-4.8.0 STRIP=/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-strip @@ -91,45 +108,110 @@ CFLAGSOPT= -O3 UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac CP= cp +BINVERSION=WIN32onOSX +endif + +ifdef _mw64onosx +GCC=/usr/local/mingw-w64-bin_i686-darwin_20130622/bin/x86_64-w64-mingw32-gcc-4.9.0 +STRIP=/usr/local/mingw-w64-bin_i686-darwin_20130622/bin/x86_64-w64-mingw32-strip +LFLAGS= -g +CFLAGS= -g +LFLAGSOPT= -O3 -lm -s +CFLAGSOPT= -O3 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +BINVERSION=w64-mingw32-x86-64-bin +endif + +ifdef _windowscl +rem "C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvas32.bat" +endif + +# make _intel64onosx=1 imachopt +#source /opt/intel/bin/iccvars.sh intel64 +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 +LFLAGSOPT= -O3 -m64 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +BINVERSION=osx-intel-x86-64-bin +#imach_64$(VERSION) +# +endif + +ifdef _intel32onosx +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 +#lipo -create -arch i386 imach_32$(VERSION) -arch x86_64 imach_64$(VERSION) -output imach$(VERSION) +LFLAGSOPT= -O3 -m32 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +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 +BINVERSION=linux-x86-64-bin endif ifdef _linux32onosx #GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc -# w64 outputs bigger executables #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 +BINVERSION=linux-i586-bin endif ifdef _linux #CFLAGS= -g -DUNIX -DDEBUGHESS -CFLAGS= -g -DUNIX -DLINUX -LFLAGS= -g -lm +CFLAGS= -g -DDEBUG +LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas -CFLAGSOPT= -O3 -DUNIX -DLINUX -LFLAGSOPT= -O3 -lm +INLOPT= -I/usr/local/include +LNLOPT= -lm -L/usr/local/lib -lnlopt +CFLAGSOPT= -O3 -g +LFLAGSOPT= -O3 -g -lm UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" +BINVERSION=LINUXnative +CP= cp endif SED= sed @@ -137,7 +219,6 @@ PACKAGE=imach PROGRAM=IMaCh - TMPSETUPSCRIPT=setup.iss TMPNOREGSETUPSCRIPT=noreg-setup.iss TMPSCRIPTIN=setup.iss.in @@ -192,6 +273,7 @@ PARAM=mypar1 imachcyg-setup: imachcygopt.exe setup.iss touch setup.iss.in $(CP) imachcygopt.exe imach.exe + $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe $(SETUPCOMP) /cc setup.iss cp Output/$(TMPSETUPEXE) imachcyg-setup @@ -199,9 +281,47 @@ imachcyg-setup: imachcygopt.exe setup.is imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss touch setup.iss.in $(CP) imachcygopt.exe imach.exe + $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup +imachILC64-setup: IMaCh-ilc64.exe setup.iss + pwd + $(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 + +imachILC32-setup: IMaCh-ilc32-XP.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 + $(SETUPCOMP) /cc setup.iss + $(CP) Output/$(TMPSETUPEXE) imachcyg-setup + +# imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE) +imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss + touch setup.iss.in + $(CP) imachMVC.exe imach.exe + $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) + $(CP) Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup + simach : simach.o $(CC) $(LFLAGS) $(LGSL) -o simach simach.o simach.o : simach.c @@ -214,7 +334,11 @@ ifdef _macosx endif imach.o : imach.c - $(CC) $(CFLAGS) -DPOWELL -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 + cl /O2 /MT /o imach.exe imach.c imach097b : imach097b.o $(CC) $(LFLAGS) -o imach097b imach097b.o @@ -228,16 +352,48 @@ imachsimplified.o : imachsimplified.c $(CC) $(CFLAGSOPT) -DPOWELL -c imachsimplified.c imachgsl : imachgsl.o - $(CC) $(LFLAGS) $(LGSL) -o imachgsl imach.o + $(CC) -o imachgsl imach.o $(LFLAGS) $(LGSL) imachgsl.o : imach.c $(CC) $(CFLAGS) -DGSL $(IGSL) -c imach.c +imachNEWUOAopt : imachNEWUOAopt.o + $(CC) -o imachNEWUOAopt imachNEWUOAopt.o $(LFLAGS) -g $(LNLOPT) +imachNEWUOAopt.o : imach.c + $(CC) $(CFLAGS) -g -DNLOPT $(INLOPT) -DNEWUOA -o imachNEWUOAopt.o -c imach.c + +imachBOBYQAopt : imachBOBYQAopt.o + $(CC) -o imachBOBYQAopt imachBOBYQAopt.o $(LFLAGS) $(LNLOPT) +imachBOBYQAopt.o : imach.c + $(CC) $(CFLAGS) -DNLOPT $(INLOPT) -DBOBYQA -o imachBOBYQAopt.o -c imach.c + + imachopt : imachopt.o $(CC) $(LFLAGSOPT) -o imachopt imachopt.o ln -f imachopt imach -imachopt.o : imach.c - $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c + $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) + $(CP) -f imach ../bin +ifdef _intel64onosx + $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) +endif +ifdef _macosx + $(STRIP) imach +endif +ifdef _linux32onosx + (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt) +endif +ifdef _linux64onosx + (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) $(CROSSCOMPILATION) -o imachopt.o -c imach.c +# $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c + +imachUB : imach32 imach64 + lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION) + +#imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf 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 #hdiutil detach /Volumes/IMaCh\ $(VERSION) @@ -273,16 +429,14 @@ upload: ls Output/* | xargs md5sum rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/ -imachcyg : imachcyg.o strsep.o - $(CC) $(LFLAGS) -o imach imachcyg.o strsep.o +imachcyg : imachcyg.o + $(CC) $(LFLAGS) -o imach imachcyg.o imachcyg.o : imach.c $(CC) $(CFLAGS) -c -o imachcyg.o imach.c -imachcygopt.exe : imachcygopt.o strsep.o - $(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o strsep.o +imachcygopt.exe : imachcygopt.o + $(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o imachcygopt.o : imach.c $(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c -strsep.o : strsep.c - $(CC) $(CFLAGSOPT) -c -o strsep.o strsep.c imachw32.o : imach.c i386-mingw32-gcc -c imach.c -o imachw32.o