--- imach/src/Makefile 2014/08/27 16:23:13 1.39 +++ imach/src/Makefile 2014/09/01 17:51:01 1.42 @@ -1,15 +1,23 @@ -VERSION=0.98nX +VERSION=0.98nY 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 +# Linux # make _linux=1 imachopt # make _linux=1 imach +# +# make _linux32onosx=1 imachopt +# make _linux64onosx=1 imachopt +# OS/X # make _macosx=1 imach # 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 imachMVC-setup (touch setup.iss.in) +# make imachMVC-noreg-setup +# # make _windows=1 imachcyg # make _windows=1 imachcyg-setup (touch setup.iss.in) # make _windows=1 imachcyg-noreg-setup @@ -17,8 +25,8 @@ IMACHSETUPVERSION=1 # make _windowsonlinux=1 imachcyg-setup (touch setup.iss.in) # make _windowsonlinux=1 imachcyg-noreg-setup # -# make _windowsonosx=1 imachcyg-setup (touch setup.iss.in) -# make _windowsonosx=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 @@ -39,6 +47,8 @@ LFLAGSOPT= -O3 -lm -DUNIX CFLAGSOPT= -O3 -DUNIX 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 @@ -57,6 +67,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" @@ -72,32 +83,69 @@ 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 +#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 +LFLAGS= -g +CFLAGS= -g +LFLAGSOPT= -O3 -s +CFLAGSOPT= -O3 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +BINVERSION=WIN32onOSX +endif + +ifdef _windowscl +rem "C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvas32.bat" +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 +LFLAGS= -g +CFLAGS= -g +LFLAGSOPT= -O3 -lm -s +CFLAGSOPT= -O3 +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 LFLAGS= -g CFLAGS= -g -LFLAGSOPT= -O3 +LFLAGSOPT= -O3 -s -lm CFLAGSOPT= -O3 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 +LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas CFLAGSOPT= -O3 -DUNIX -DLINUX -LFLAGSOPT= -O3 -lm +LFLAGSOPT= -O3 -lm -s UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" +BINVERSION=LINUXnative endif SED= sed @@ -105,7 +153,6 @@ PACKAGE=imach PROGRAM=IMaCh - TMPSETUPSCRIPT=setup.iss TMPNOREGSETUPSCRIPT=noreg-setup.iss TMPSCRIPTIN=setup.iss.in @@ -160,6 +207,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 @@ -167,9 +215,23 @@ 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 +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 @@ -184,6 +246,10 @@ endif imach.o : 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 imach097b.o : imach097b.c @@ -203,6 +269,21 @@ imachgsl.o : imach.c imachopt : imachopt.o $(CC) $(LFLAGSOPT) -o imachopt imachopt.o ln -f imachopt imach +ifdef _macosx + $(STRIP) imach + cp imach ../bin +endif +ifdef _linux32onosx + $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) + cp -f imach ../bin + (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt) +endif +ifdef _linux64onosx + $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) + cp -f imach ../bin + (cd .. && gnutar 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) -DPOWELL -o imachopt.o -c imach.c