X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2FMakefile;fp=source%2Fcluster%2Fwham%2Fsrc%2FMakefile;h=b192a7b05231c6d4f58ae35ce366ca775d5bef58;hb=80ccfedfd50c0d57ff16f37f31903809f747bc11;hp=333ebec15554b956e7c57a2dde770c3af70fa150;hpb=edab12f52f383e09c1e77f0704f8ef58e0ecdf33;p=unres.git

diff --git a/source/cluster/wham/src/Makefile b/source/cluster/wham/src/Makefile
index 333ebec..b192a7b 100644
--- a/source/cluster/wham/src/Makefile
+++ b/source/cluster/wham/src/Makefile
@@ -3,9 +3,15 @@ BIN=../../../../bin
 FC = ifort
 OPT = -O3 -ip -w
 OPT = -CB -g 
+<<<<<<< HEAD
+FFLAGS =  ${OPT} -c -I. -Iinclude_unres -I$(INSTALL_DIR)/include
+CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
+LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a -g -d2 -CA -CB
+=======
 FFLAGS =  ${OPT} -c -I. -I./include_unres -I../src_MD_T-sccor -I/users/adam/MEY_MD/src_Tc-czarek -I$(INSTALL_DIR)/include
 CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
 LIBS = -L$(INSTALL_DIR)/lib -lmpich ./xdrf/libxdrf.a -g -d2 -CA -CB
+>>>>>>> devel
 
 .c.o:
 	cc -c -DLINUX -DPGI $*.c