diff --git a/haversine_02/compile b/haversine_02/compile index 9694bed..6797c51 100644 --- a/haversine_02/compile +++ b/haversine_02/compile @@ -1,16 +1,22 @@ #!/bin/bash -CC=clang++ +CC=clang +CXX=clang++ CFLAGS="-g -Wall -Wextra -Iinclude" # generator -GENSRC="./src/argparser.cpp ./src/generator.cpp ./src/haversine.cpp ./src/point_types.cpp ./src/genmain.cpp" +GENSRC="./src/generator/gen_argparser.cpp ./src/generator/generator.cpp ./src/haversine.cpp ./src/point_types.cpp ./src/generator/main.cpp" GENOUT=genhavr -(set -x ; $CC $CFLAGS $GENSRC -o $GENOUT) +(set -x ; $CXX $CFLAGS $GENSRC -o $GENOUT) -# json parser -JSONSRC="./src/jsonparse.cpp" -JSONOUT=jsonparse +# processor +JSONSRC="./src/json/*.c" +JSONFLAGS="-c" +PROCSRC="./*.o ./src/haversine.cpp ./src/point_types.cpp ./src/processor/proc_argparser.cpp ./src/processor/main.cpp" +PROCOUT=prochavr -(set -x ; $CC $CFLAGS $JSONSRC -o $JSONOUT) +(set -x ; $CC $CFLAGS $JSONFLAGS $JSONSRC) +(set -x ; $CXX $CFLAGS $PROCSRC -o $PROCOUT) + +rm ./*.o