Commit 6e181ec1 authored by mzed's avatar mzed

Merge branch 'develop' into phraseToExample

parents 556eb3d4 bbf695ea
......@@ -88,7 +88,7 @@ file(GLOB JSON_SRC "${PROJECT_SOURCE_DIR}/dependencies/third_party/jsoncpp.cpp")
set(RAPIDMIX_FULL_SRC ${RAPIDMIX_SRC}
${GVF_SRC}
${MAXI_SRC}
${PIPO_SRC}
# ${PIPO_SRC}
${RAPIDLIB_SRC}
${RAPIDLIB_DEP}
${XMM_SRC}
......
#!/bin/bash
#Make sure we've got the latest version
git pull
git submodule update --init --recursive
rm -rf /build
mkdir build
cd build
cmake ..
make
./rapidmixTest
\ No newline at end of file
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