--- imach/src/Makefile 2014/09/01 18:07:27 1.43 +++ imach/src/Makefile 2014/09/16 11:01:02 1.46 @@ -1,6 +1,6 @@ VERSION=0.98nX 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=2 +IMACHSETUPVERSION=ilc64 # Linux # make _linux=1 imachopt @@ -15,9 +15,13 @@ IMACHSETUPVERSION=2 # 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 _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 # +# 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 @@ -32,7 +36,8 @@ IMACHSETUPVERSION=2 # 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 @@ -41,10 +46,10 @@ 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 @@ -88,7 +93,6 @@ 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 @@ -102,6 +106,19 @@ 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 @@ -121,7 +138,6 @@ 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 @@ -141,6 +157,8 @@ CFLAGS= -g -DUNIX -DLINUX LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas +INLOPT= -I/usr/local/include +LNLOPT= -lm -L/usr/local/lib -lnlopt CFLAGSOPT= -O3 -DUNIX -DLINUX LFLAGSOPT= -O3 -lm -s UNIX2DOS= unix2dos @@ -219,6 +237,18 @@ imachcyg-noreg-setup: imachcygopt.exe no $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup +imachILC64-setup: IMaCh-ilc64.exe setup.iss + touch setup.iss.in + $(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 + imachMVC-setup: imachMVC.exe setup.iss touch setup.iss.in $(CP) imachMVC.exe imach.exe @@ -244,7 +274,9 @@ ifdef _macosx endif imach.o : imach.c - $(CC) $(CFLAGS) -DPOWELL -c imach.c + $(CC) $(CFLAGS) -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 @@ -262,10 +294,15 @@ 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 +imachnlopt : imachnlopt.o + $(CC) -o imachnlopt imach.o $(LFLAGS) $(LNLOPT) +imachnlopt.o : imach.c + $(CC) $(CFLAGS) -DNLOPT $(INLOPT) -c imach.c + imachopt : imachopt.o $(CC) $(LFLAGSOPT) -o imachopt imachopt.o ln -f imachopt imach @@ -285,7 +322,9 @@ ifdef _linux64onosx endif imachopt.o : imach.c - $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c + $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c + +# $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c 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 @@ -322,16 +361,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