From 4c6c7eba5c22a3e44278dfd80e3b42aaaad29c1c Mon Sep 17 00:00:00 2001 From: Tim Coalson Date: Wed, 28 Feb 2018 17:39:46 -0600 Subject: [PATCH] fix makefiles to point to the ELC1.04 folder, as the previous folder was removed --- src/MSM/Makefile | 2 +- src/MSMRegLib/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MSM/Makefile b/src/MSM/Makefile index 1faf20f..4119ff3 100644 --- a/src/MSM/Makefile +++ b/src/MSM/Makefile @@ -5,7 +5,7 @@ PROJNAME= MSM USRCXXFLAGS=-g HOCR=True -USRINCFLAGS=-I${INC_NEWMAT} -I${INC_NEWRAN} -I${INC_ZLIB} -I${INC_CPROB} -I${INC_PROB} -I${INC_GD} -I${INC_GDC} -I${INC_PNG} -I${INC_BOOST} -I./include -I${FSLDEVDIR}/include -I${FSLDEVDIR}/extras/include +USRINCFLAGS=-I${INC_NEWMAT} -I${INC_NEWRAN} -I${INC_ZLIB} -I${INC_CPROB} -I${INC_PROB} -I${INC_GD} -I${INC_GDC} -I${INC_PNG} -I${INC_BOOST} -I./include -I${FSLDEVDIR}/include -I${FSLDEVDIR}/extras/include -I${FSLDEVDIR}/extras/ELC1.04 USRLDFLAGS=-L${LIB_NEWMAT} -L${LIB_NEWRAN} -L${LIB_ZLIB} -L${LIB_CPROB} -L${LIB_PROB} -L${LIB_GDC} -L${LIB_PNG} -L${LIB_GD} -L. -L${FSLDEVDIR}/lib -L${FSLDEVDIR}/extras/lib LIBS= -lmeshreg -lfastpd -ldiscrete -lnewmeshclass -lfslsurface -lgiftiio -lmm -lexpat -lfslvtkio -lnewimage -lmiscmaths -lmiscplot -lmiscpic -lfslio -lniftiio -lnewmat -lutils -lbint -lnewran -lprob -lznz -lgdc -lgd -lpng -lz diff --git a/src/MSMRegLib/Makefile b/src/MSMRegLib/Makefile index 42e5a37..82f8243 100644 --- a/src/MSMRegLib/Makefile +++ b/src/MSMRegLib/Makefile @@ -5,7 +5,7 @@ PROJNAME = MeshReg USRCXXFLAGS=-g HOCR=True -USRINCFLAGS =-I${INC_NEWMAT} -I${INC_NEWRAN} -I${INC_ZLIB} -I${INC_CPROB} -I${INC_PROB} -I${INC_GD} -I${INC_GDC} -I${INC_PNG} -I${INC_BOOST} -I${FSLDEVDIR}/include -I${FSLDEVDIR}/extras/include +USRINCFLAGS =-I${INC_NEWMAT} -I${INC_NEWRAN} -I${INC_ZLIB} -I${INC_CPROB} -I${INC_PROB} -I${INC_GD} -I${INC_GDC} -I${INC_PNG} -I${INC_BOOST} -I${FSLDEVDIR}/include -I${FSLDEVDIR}/extras/include -I${FSLDEVDIR}/extras/ELC1.04 USRLDFLAGS =-L${LIB_NEWMAT} -L${LIB_NEWRAN} -L${LIB_ZLIB} -L${LIB_CPROB} -L${LIB_PROB} -L${LIB_GDC} -L${LIB_PNG} -L${LIB_GD} -L. -L${FSLDEVDIR}/lib -L${FSLDEVDIR}/extras/lib LIBS= -lmsm -lfastpd -ldiscrete -lnewmeshclass -lfslsurface -lgiftiio -lmm -lexpat -lfslvtkio -lnewimage -lmiscmaths -lmiscplot -lmiscpic -lfslio -lniftiio -lnewmat -lutils -lbint -lnewran -lprob -lznz -lgdc -lgd -lpng -lz MSMLIBOBJS= ContinuosOpt.o meshmodify.o meshreg.o