mirror/MUSIC
1
0
Fork 0
mirror of https://github.com/cosmo-sims/MUSIC.git synced 2024-09-19 17:03:46 +02:00
Code Releases Activity

fixed leftover diff marks in Makefile

Browse source
This commit is contained in:
Oliver Hahn 2013-10-13 00:16:25 +02:00
parent 09c8251d06
commit c7d5e09e4f
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -3,31 +3,18 @@
FFTW3 = yes
MULTITHREADFFTW = yes
SINGLEPRECISION = no
<<<<<<< local
HAVEHDF5 = yes
=======
HAVEHDF5 = no
>>>>>>> other
HAVEBOXLIB = no
BOXLIB_HOME = ${HOME}/nyx_tot_sterben/BoxLib
##############################################################################
### compiler and path settings
CC = g++
<<<<<<< local
OPT = -Wall -Wno-unknown-pragmas -O3 -g -mtune=native
=======
OPT = -Wall -Wno-unknown-pragmas -O3 -g -msse2
>>>>>>> other
CFLAGS =
LFLAGS = -lgsl -lgslcblas
<<<<<<< local
CPATHS = -I. -I/opt/local/include -I/usr/local/include
LPATHS = -L/opt/local/lib -L/usr/local/lib
=======
CPATHS = -I. -I$(HOME)/local/include -I/opt/local/include -I/usr/local/include
LPATHS = -L$(HOME)/local/lib -L/opt/local/lib -L/usr/local/lib
>>>>>>> other
##############################################################################
# if you have FFTW 2.1.5 or 3.x with multi-thread support, you can enable the