(14b3f4f9) · Commits · 郑智淋 / lammps

src/MAKE/Makefile.mac

+4 −4

Original line number	Diff line number	Diff line
		@@ -8,12 +8,12 @@ SHELL = /bin/sh
		include Makefile.package

		CC = c++
		CCFLAGS = $(PKGINC) -O -I../STUBS -DFFT_FFTW
		CCFLAGS = -O -DFFT_FFTW -I../STUBS $(PKGINC)
		DEPFLAGS = -M
		LINK = c++
		LINKFORT =
		LINKFLAGS = $(PKGPATH) $(LINKFORT) -O
		USRLIB = $(PKGLIB) -lfftw ../STUBS/mpi.o
		LINKFLAGS = -O $(PKGPATH) $(LINKFORT)
		USRLIB = -lfftw ../STUBS/mpi.o $(PKGLIB)
		FORTLIB =
		SYSLIB = $(FORTLIB)
		SIZE = size

+5 −5

Original line number	Diff line number	Diff line
		@@ -10,12 +10,12 @@ include Makefile.package
		FFTW = /sw

		CC = mpic++
		CCFLAGS = $(PKGINC) -O -MMD -MG -DFFT_FFTW -I${FFTW}/include -DOMPI_SKIP_MPICXX
		CCFLAGS = -O -MMD -MG -DFFT_FFTW \
		-I${FFTW}/include -DOMPI_SKIP_MPICXX $(PKGINC)
		LINK = mpic++
		LINKFORT =
		LINKFLAGS = $(PKGPATH) $(LINKFORT) -O -L${FFTW}/lib

		USRLIB = $(PKGLIB) -lfftw
		LINKFLAGS = -O -L${FFTW}/lib $(PKGPATH) $(LINKFORT)
		USRLIB = -lfftw $(PKGLIB)
		FORTLIB =
		SYSLIB = $(FORTLIB)
		SIZE = size

+6 −8

Original line number	Diff line number	Diff line
		@@ -11,16 +11,14 @@ FFTW_INC = ${TACC_FFTW2_INC}
		FFTW_LIB = ${TACC_FFTW2_LIB}

		CC = mpiCC
		CCFLAGS = $(PKGINC) -O -DFFT_FFTW -I${FFTW_INC}
		CCFLAGS = -O -DFFT_FFTW -I${FFTW_INC} $(PKGINC)
		DEPFLAGS = -M
		LINK = mpiCC
		LINKFORT =
		LINKFLAGS = $(PKGPATH) $(LINKFORT) -O -L${FFTW_LIB}
		USRLIB = $(PKGLIB) ${FFTW_LIB}/libfftw.a
		FORTLIB =
		SYSLIB = $(FORTLIB) -L/opt/apps/intel/10.1/fc/lib -lifcore
		#SYSLIB = $(FORTLIB) -L/opt/apps/intel/10.1/fc/lib -lifcore (use if linking to MEAM)
		ARCHIVE = ar
		LINKFORT = -L/opt/apps/intel/10.1/fc/lib
		LINKFLAGS = -O -L${FFTW_LIB} $(PKGPATH) $(LINKFORT)
		USRLIB = ${FFTW_LIB}/libfftw.a $(PKGLIB)
		FORTLIB = -lifcore
		SYSLIB = $(FORTLIB)
		ARFLAGS = -rc
		SIZE = size

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,14 +28,14 @@ SHELL = /bin/sh
		include Makefile.package

		CC = mpicxx
		CCFLAGS = $(PKGINC) -O -DFFT_FFTW -I$(FFTW_INCLUDE)
		CCFLAGS = -O -DFFT_FFTW -I$(FFTW_INCLUDE) $(PKGINC)
		DEPFLAGS = -M
		LINK = mpicxx
		LINKFORT =
		LINKFLAGS = $(PKGPATH) $(LINKFORT) -O
		USRLIB = $(PKGLIB) $(BLASLIB) $(FFTW_LINK_LINE) -lstdc++
		LINKFLAGS = -O $(PKGPATH) $(LINKFORT)
		USRLIB = $(BLASLIB) $(FFTW_LINK_LINE) -lstdc++ $(PKGLIB)
		FORTLIB =
		SYSLIB = $(FORTLIB) -lm
		SYSLIB = -lm $(FORTLIB)
		SIZE = size
		ARCHIVE = ar
		ARFLAGS = -rc