Diff of /trunk/gadget/Makefile

Parent Directory | Revision Log | Patch

	revision 22, Mon Apr 17 09:50:59 2017 UTC	revision 23, Mon Apr 17 11:28:42 2017 UTC
#	Line 42	Line 42
42	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
43	##########################################################################	##########################################################################
44	# 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative	# 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative
45	CXX = icpc	#CXX = icpc
46	LIBDIRS = -L.	#LIBDIRS = -L.
47	LIBRARIES =	#LIBRARIES =
48	#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -mmic  -DSPECULATIVE	#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -mmic  -DSPECULATIVE
49	CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp	#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp
	OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
	#CXX = g++
	#LIBDIRS = -L. -L/usr/local/lib
	#LIBRARIES = -lm
	#CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -DSPECULATIVE
50	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
51		CXX = g++-6
52		LIBDIRS = -L. -L/usr/local/lib
53		LIBRARIES = -lm
54		CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
55		OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
56	##########################################################################	##########################################################################
57	# 3. Solaris, without pvm3, using CC compiler	# 3. Solaris, without pvm3, using CC compiler
58	#CXX = CC	#CXX = CC

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.22   changed lines   Added in v.23

---

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0