--- trunk/gadget/Makefile 2017/04/07 09:20:55 20 +++ trunk/gadget/Makefile 2017/04/17 11:28:42 23 @@ -42,17 +42,17 @@ #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) ########################################################################## # 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative -CXX = icpc -LIBDIRS = -L. -LIBRARIES = +#CXX = icpc +#LIBDIRS = -L. +#LIBRARIES = #CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -mmic -DSPECULATIVE -CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) -#CXX = g++ -#LIBDIRS = -L. -L/usr/local/lib -#LIBRARIES = -lm -#CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -DSPECULATIVE +#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) +CXX = g++-6 +LIBDIRS = -L. -L/usr/local/lib +LIBRARIES = -lm +CXXFLAGS = $(DEFINE_FLAGS) -fopenmp +OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) ########################################################################## # 3. Solaris, without pvm3, using CC compiler #CXX = CC