[BACK]Return to Makefile CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/Makefile between versions 1.48 and 1.49

version 1.48, 2014/12/22 23:06:35 version 1.49, 2014/12/23 11:17:26
Line 1 Line 1
 VERSION=0.99  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)  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=ilc64  IMACHSETUPVERSION=ilc64
   
Line 11  IMACHSETUPVERSION=ilc64 Line 11  IMACHSETUPVERSION=ilc64
   
 #       OS/X  #       OS/X
 # make _intel64onosx=1 imachopt  # make _intel64onosx=1 imachopt
   # make _intel32onosx=1 imachopt
   # make _intelUNBonosx=1 imachdmg # Not implemented (not useful)
 # make _macosx=1 imach  # make _macosx=1 imach
   # make _macosx=1 imachopt
 # make _macosx=1 imachdmg  # 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  #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach
   
Line 129  endif Line 132  endif
 ifdef _intel64onosx  ifdef _intel64onosx
 GCC=/opt/intel/bin/icc  GCC=/opt/intel/bin/icc
 CFLAGS= -m64 -g -std=c99  CFLAGS= -m64 -g -std=c99
   LFLAGS= -g -m64
   CFLAGSOPT= -O3 -m64 -g -std=c99
 IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh intel64; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")  IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh intel64; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv")
 include makeenv  include makeenv
 #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld  #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld
 LFLAGSOPT= -O3  LFLAGSOPT= -O3 -m64
 UNIX2DOS= unix2dos  UNIX2DOS= unix2dos
 SETUPCOMP= ~/bin/InnoSetup5Playonmac  SETUPCOMP= ~/bin/InnoSetup5Playonmac
 CP= cp  CP= cp
 BINVERSION=osx-intel-x86-64-bin  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
   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  endif
   
 ifdef _linux64onosx  ifdef _linux64onosx
Line 326  imachBOBYQAopt.o : imach.c Line 349  imachBOBYQAopt.o : imach.c
 imachopt : imachopt.o   imachopt : imachopt.o 
         $(CC) $(LFLAGSOPT) -o imachopt imachopt.o          $(CC) $(LFLAGSOPT) -o imachopt imachopt.o
         ln -f imachopt imach          ln -f imachopt imach
           $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
           cp -f imach ../bin
   ifdef _intel64onosx
           $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
   endif
 ifdef _macosx  ifdef _macosx
         $(STRIP) imach          $(STRIP) imach
         cp imach ../bin  
 endif  endif
 ifdef _linux32onosx  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)          (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif  endif
 ifdef _linux64onosx  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)          (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif  endif
   
Line 345  imachopt.o : imach.c Line 368  imachopt.o : imach.c
         $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c          $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
 #       $(CC) $(CFLAGSOPT) -DPOWELL -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  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          $(CC) $(LFLAGSOPT) -o imach imachopt.o
         #hdiutil detach /Volumes/IMaCh\ $(VERSION)          #hdiutil detach /Volumes/IMaCh\ $(VERSION)
Removed from v.1.48  
changed lines
  Added in v.1.49

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>