(file) Return to make_basic.mk CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.12 and 1.13

version 1.12, 2008/03/10 18:32:23 version 1.13, 2008/03/12 14:45:40
Line 56  endif
Line 56  endif
 FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include
 CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include
  
 ifeq ($(COMPILER), icc)  
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio
     # Path to 64-bit 3rd-party libraries     # Path to 64-bit 3rd-party libraries
Line 76  ifeq ($(COMPILER), icc)
Line 75  ifeq ($(COMPILER), icc)
     FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio     FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio
     CFITSIOLIBS = $(CFITSIOL) -lcfitsio     CFITSIOLIBS = $(CFITSIOL) -lcfitsio
   endif   endif
 endif  
  
 ### Build flags for all targets ### Build flags for all targets
 # #


Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13

Karen Tian
Powered by
ViewCVS 0.9.4