Commit 57292aa8 authored by Matthieu Constant's avatar Matthieu Constant
Browse files

Merge branch 'NewTwoFluids' of git.immc.ucl.ac.be:fluidparticles/marblesbag into NewTwoFluids

parents e75c932c 47bc385c
Pipeline #3742 passed with stage
in 1 minute and 30 seconds
......@@ -19,7 +19,7 @@
# along with this program (see COPYING and COPYING.LESSER files). If not,
# see <http://www.gnu.org/licenses/>.
ALL: libmbfluid3.so libmbfluid2.so libscontact2.so libscontact3.so
ALL: libmbfluid2.so libscontact2.so libscontact3.so
CFLAGS=-Wno-unused-function -g -O3 -march=native -mtune=native -fPIC -std=gnu99 -Iscontact -Ihxt -Isrc
LDFLAGS=-shared -lm
......@@ -44,8 +44,8 @@ SCONTACT_H=scontact/quadtree.h scontact/scontact.h src/mbxml.h src/yxml.h
libmbfluid2.so : ${FLUID_C} ${FLUID_H}
${CC} ${FLUID_C} -o $@ ${CFLAGS} ${LDFLAGS} -DDIMENSION=2
#libmbfluid3.so : ${FLUID_C} ${FLUID_H}
# ${CC} ${FLUID_C} -o $@ ${CFLAGS} ${LDFLAGS} -DDIMENSION=3
libmbfluid3.so : ${FLUID_C} ${FLUID_H}
${CC} ${FLUID_C} -o $@ ${CFLAGS} ${LDFLAGS} -DDIMENSION=3
libscontact2.so : ${SCONTACT_C} ${SCONTACT_H}
${CC} ${SCONTACT_C} -o $@ ${CFLAGS} ${LDFLAGS} -DDIMENSION=2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment