|
version 1.13, 2008/03/12 14:45:40
|
version 1.14, 2008/04/08 00:31:26
|
| Line 65 ifeq ($(JSOC_MACHINE), linux_x86_64) |
|
| Line 65 ifeq ($(JSOC_MACHINE), linux_x86_64) |
|
| # All 3rd-party math libraries - local rules can define a subset | # All 3rd-party math libraries - local rules can define a subset |
| FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio | FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio |
| CFITSIOLIBS = $(CFITSIOL) -lcfitsio | CFITSIOLIBS = $(CFITSIOL) -lcfitsio |
| else |
endif |
| |
ifeq ($(JSOC_MACHINE), linux_ia32) |
| # FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio | # FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio |
| # Path to 32-bit 3rd-party libraries | # Path to 32-bit 3rd-party libraries |
| FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/ | FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/ |
|
|
|
| FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio | FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio |
| CFITSIOLIBS = $(CFITSIOL) -lcfitsio | CFITSIOLIBS = $(CFITSIOL) -lcfitsio |
| endif | endif |
| |
ifeq ($(JSOC_MACHINE), mac_osx) |
| |
# FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio |
| |
# Path to 32-bit 3rd-party libraries |
| |
FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/ |
| |
CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/ |
| |
|
| |
# All 3rd-party math libraries - local rules can define a subset |
| |
FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio |
| |
CFITSIOLIBS = $(CFITSIOL) -lcfitsio |
| |
endif |
| | |
| ### Build flags for all targets | ### Build flags for all targets |
| # | # |
Return to
make_basic.mk
CVS log
Up to [Development] / JSOC